summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-10-15 22:13:37 +0200
committerWolfgang Denk <wd@denx.de>2009-10-15 22:13:37 +0200
commit9efe379a0eb127e616d780533a711f99b52ea64a (patch)
treea93be31becad046d17d9bd0a682180dbb811da3d /cpu
parenta380279b2abe130c2d3d2c8de36f8ff98bc6b3b0 (diff)
parentd087d19a994e741f0ce526124be117c90be482ae (diff)
downloadu-boot-imx-9efe379a0eb127e616d780533a711f99b52ea64a.zip
u-boot-imx-9efe379a0eb127e616d780533a711f99b52ea64a.tar.gz
u-boot-imx-9efe379a0eb127e616d780533a711f99b52ea64a.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-blackfin
Diffstat (limited to 'cpu')
-rw-r--r--cpu/blackfin/interrupts.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/cpu/blackfin/interrupts.c b/cpu/blackfin/interrupts.c
index bf6fb4b..19456e5 100644
--- a/cpu/blackfin/interrupts.c
+++ b/cpu/blackfin/interrupts.c
@@ -20,6 +20,7 @@
#include <common.h>
#include <config.h>
+#include <watchdog.h>
#include <asm/blackfin.h>
#include "cpu.h"
@@ -70,6 +71,8 @@ void udelay(unsigned long usec)
cclk = (CONFIG_CCLK_HZ);
while (usec > 1) {
+ WATCHDOG_RESET();
+
/*
* how many clock ticks to delay?
* - request(in useconds) * clock_ticks(Hz) / useconds/second