Merge ../u-boot

[karo-tx-uboot.git] / lib_microblaze / time.c

diff --git a/lib_microblaze/time.c b/lib_microblaze/time.c
index 3fa1b112627664d9fefa13bc1d5aea13bc40796d..0fef834992a55d15305d61d07734cdec4a503bfa 100644 (file)
--- a/lib_microblaze/time.c
+++ b/lib_microblaze/time.c
@@ -26,9 +26,17 @@
 
 #include <common.h>
 
+#ifdef CFG_TIMER_0
 void udelay (unsigned long usec)
 {
        int i;
        i = get_timer (0);
        while ((get_timer (0) - i) < (usec / 1000)) ;
 }
+#else
+void udelay (unsigned long usec)
+{
+       unsigned int i;
+       for (i = 0; i < (usec * XILINX_CLOCK_FREQ / 10000000); i++);
+}
+#endif