summaryrefslogtreecommitdiff
path: root/arch/blackfin/cpu/start.S
diff options
context:
space:
mode:
authorBob Liu <lliubbo@gmail.com>2011-12-27 15:05:53 +0800
committersonic <sonic@sonic-linuxvm.(none)>2013-03-04 13:42:07 +0800
commit49c2da53b7aa63f68118fa9ffa5c5e546440ebb2 (patch)
tree3034e5856175c7e276b1425a1a28e493b1ad99b3 /arch/blackfin/cpu/start.S
parent4a207e8b9a1ecc3e87d5a63bb5442dbcd50bd4b6 (diff)
blackfin: bf60x: add hw watchdog support
Signed-off-by: Bob Liu <lliubbo@gmail.com> Signed-off-by: Sonic Zhang <sonic.zhang@analog.com> Signed-off-by: Sonic Zhang <sonic.adi@gmail.com>
Diffstat (limited to 'arch/blackfin/cpu/start.S')
-rw-r--r--arch/blackfin/cpu/start.S2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/blackfin/cpu/start.S b/arch/blackfin/cpu/start.S
index 90b4d1ae94..7155fc858b 100644
--- a/arch/blackfin/cpu/start.S
+++ b/arch/blackfin/cpu/start.S
@@ -65,6 +65,7 @@ ENTRY(_start)
p5.h = HI(COREMMR_BASE);
#ifdef CONFIG_HW_WATCHDOG
+#ifndef __ADSPBF60x__
# ifndef CONFIG_HW_WATCHDOG_TIMEOUT_START
# define CONFIG_HW_WATCHDOG_TIMEOUT_START 5000
# endif
@@ -78,6 +79,7 @@ ENTRY(_start)
/* fire up the watchdog - R0.L above needs to be 0x0000 */
W[p4 + (WDOG_CTL - SYSMMR_BASE)] = r0;
#endif
+#endif
/* Turn on the serial for debugging the init process */
serial_early_init