]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
arm, at91, wdt: do not disable WDT in SPL
authorHeiko Schocher <hs@denx.de>
Wed, 21 Jan 2015 07:38:20 +0000 (08:38 +0100)
committerLothar Waßmann <LW@KARO-electronics.de>
Tue, 1 Sep 2015 10:59:14 +0000 (12:59 +0200)
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

index 6473320097060c57d08b467c7871fc5bbbbaf9a2..aaa5eec2e66ff026f32cb265a1725847856cde7b 100644 (file)
 #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)
 {