summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorHeiko Schocher <hs@denx.de>2015-01-21 08:38:20 +0100
committerAndreas Bießmann <andreas.devel@googlemail.com>2015-02-07 23:43:07 +0100
commit49b461f34a29fa88565c8cffa57a42a04ff36848 (patch)
tree3110021dfec9ee7bb6da40d6f1e5cb85acdc57d1 /arch
parent26961772ff2abd89dddf6232a458f8ff7d49c4f8 (diff)
downloadu-boot-imx-49b461f34a29fa88565c8cffa57a42a04ff36848.zip
u-boot-imx-49b461f34a29fa88565c8cffa57a42a04ff36848.tar.gz
u-boot-imx-49b461f34a29fa88565c8cffa57a42a04ff36848.tar.bz2
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 <hs@denx.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/cpu/at91-common/spl.c4
1 files changed, 4 insertions, 0 deletions
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)
{