diff options
author | Wolfgang Denk <wd@denx.de> | 2009-12-16 01:38:34 +0300 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2009-12-16 01:38:34 +0300 |
commit | bb3bcfa2426cc6a0aecec7270e3ee67ca843a125 (patch) | |
tree | 0314e3d8e8d9e4d568a496fca27db33d66e68bb4 /lib_ppc | |
parent | a200a7c04d89853d2a1395b96d8ca5e3dd754551 (diff) | |
parent | 4b142febff71eabdb7ddbb125c7b583b24ddc434 (diff) | |
download | u-boot-bb3bcfa2426cc6a0aecec7270e3ee67ca843a125.tar.xz |
Merge branch 'next' of ../next
Diffstat (limited to 'lib_ppc')
-rw-r--r-- | lib_ppc/time.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/lib_ppc/time.c b/lib_ppc/time.c index 173ffab3e8..29099612db 100644 --- a/lib_ppc/time.c +++ b/lib_ppc/time.c @@ -23,10 +23,6 @@ #include <common.h> -#ifndef CONFIG_WD_PERIOD -# define CONFIG_WD_PERIOD (10 * 1000 * 1000) /* 10 seconds default*/ -#endif - /* ------------------------------------------------------------------------- */ /* @@ -54,16 +50,10 @@ unsigned long usec2ticks(unsigned long usec) * microseconds to wait) into a number of time base ticks; then we * watch the time base until it has incremented by that amount. */ -void udelay(unsigned long usec) +void __udelay(unsigned long usec) { - ulong ticks, kv; - - do { - kv = usec > CONFIG_WD_PERIOD ? CONFIG_WD_PERIOD : usec; - ticks = usec2ticks (kv); - wait_ticks (ticks); - usec -= kv; - } while(usec); + ulong ticks = usec2ticks (usec); + wait_ticks (ticks); } /* ------------------------------------------------------------------------- */ |