[U-Boot] [PATCH] at91: Don't initialize watchdog if CONFIG_SYS_WDTC_WDMR_VAL is undefined

Alexander Stein alexander.stein at systec-electronic.com
Wed Jul 21 14:01:04 CEST 2010


This allows Linux to initialize and use the watchdog with the included
driver.
CONFIG_AT91SAM9_WATCHDOG and CONFIG_HW_WATCHDOG should be defined to make
u-boot trigger the watchdog

Signed-off-by: Alexander Stein <alexander.stein at systec-electronic.com>
---
 arch/arm/cpu/arm926ejs/at91/lowlevel_init.S |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/arm/cpu/arm926ejs/at91/lowlevel_init.S b/arch/arm/cpu/arm926ejs/at91/lowlevel_init.S
index 559c35c..21ebae9 100644
--- a/arch/arm/cpu/arm926ejs/at91/lowlevel_init.S
+++ b/arch/arm/cpu/arm926ejs/at91/lowlevel_init.S
@@ -186,8 +186,10 @@ SDRAM_setup_end:
 	.ltorg
 
 SMRDATA:
+#if defined(CONFIG_SYS_WDTC_WDMR_VAL)
 	.word AT91_ASM_WDT_MR
 	.word CONFIG_SYS_WDTC_WDMR_VAL
+#endif
 	/* configure PIOx as EBI0 D[16-31] */
 #if defined(CONFIG_AT91SAM9263)
 	.word AT91_ASM_PIOD_PDR
-- 
1.7.1



More information about the U-Boot mailing list