summaryrefslogtreecommitdiffstats
path: root/lib_m68k
diff options
context:
space:
mode:
authorIngo van Lil <inguin@gmx.de>2009-11-24 14:09:21 +0100
committerWolfgang Denk <wd@denx.de>2009-12-05 01:08:53 +0100
commit3eb90bad651fab39cffba750ec4421a9c01d60e7 (patch)
tree63b21148a041603db252203a422dc465e862e016 /lib_m68k
parent1c409bc7101a24ecd47a13a4e851845d66dc23ce (diff)
downloadu-boot-3eb90bad651fab39cffba750ec4421a9c01d60e7.tar.gz
u-boot-3eb90bad651fab39cffba750ec4421a9c01d60e7.tar.xz
u-boot-3eb90bad651fab39cffba750ec4421a9c01d60e7.zip
Generic udelay() with watchdog support
According to the PPC reference implementation the udelay() function is responsible for resetting the watchdog timer as frequently as needed. Most other architectures do not meet that requirement, so long-running operations might result in a watchdog reset. This patch adds a generic udelay() function which takes care of resetting the watchdog before calling an architecture-specific __udelay(). Signed-off-by: Ingo van Lil <inguin@gmx.de>
Diffstat (limited to 'lib_m68k')
-rw-r--r--lib_m68k/time.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib_m68k/time.c b/lib_m68k/time.c
index 29269f655b..7eaea5e7f7 100644
--- a/lib_m68k/time.c
+++ b/lib_m68k/time.c
@@ -47,7 +47,7 @@ static volatile ulong timestamp = 0;
#endif
extern void dtimer_intr_setup(void);
-void udelay(unsigned long usec)
+void __udelay(unsigned long usec)
{
volatile dtmr_t *timerp = (dtmr_t *) (CONFIG_SYS_UDELAY_BASE);
uint start, now, tmp;
@@ -139,7 +139,7 @@ void set_timer(ulong t)
static unsigned short lastinc;
-void udelay(unsigned long usec)
+void __udelay(unsigned long usec)
{
volatile pit_t *timerp = (pit_t *) (CONFIG_SYS_UDELAY_BASE);
uint tmp;