
21 Jan
2015
21 Jan
'15
8:38 a.m.
if CONFIG_AT91SAM9_WATCHDOG is set, do not disable WDT in SPL
Signed-off-by: Heiko Schocher hs@denx.de
---
arch/arm/cpu/at91-common/spl.c | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/arch/arm/cpu/at91-common/spl.c b/arch/arm/cpu/at91-common/spl.c index 6473320..aaa5eec 100644 --- a/arch/arm/cpu/at91-common/spl.c +++ b/arch/arm/cpu/at91-common/spl.c @@ -12,12 +12,16 @@ #include <asm/arch/clk.h> #include <spl.h>
+#if defined(CONFIG_AT91SAM9_WATCHDOG) +void at91_disable_wdt(void) { } +#else void at91_disable_wdt(void) { struct at91_wdt *wdt = (struct at91_wdt *)ATMEL_BASE_WDT;
writel(AT91_WDT_MR_WDDIS, &wdt->mr); } +#endif
u32 spl_boot_device(void) {
--
2.1.0