From: Heiko Schocher Date: Wed, 21 Jan 2015 07:38:20 +0000 (+0100) Subject: arm, at91, wdt: do not disable WDT in SPL X-Git-Tag: v2015.04-rc2~33^2~5 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=49b461f34a29fa88565c8cffa57a42a04ff36848;p=oweals%2Fu-boot.git arm, at91, wdt: do not disable WDT in SPL if CONFIG_AT91SAM9_WATCHDOG is set, do not disable WDT in SPL Signed-off-by: Heiko Schocher --- diff --git a/arch/arm/cpu/at91-common/spl.c b/arch/arm/cpu/at91-common/spl.c index 6473320097..aaa5eec2e6 100644 --- a/arch/arm/cpu/at91-common/spl.c +++ b/arch/arm/cpu/at91-common/spl.c @@ -12,12 +12,16 @@ #include #include +#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) {