git.openpandora.org
/
pandora-u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2696177
)
arm, at91, wdt: do not disable WDT in SPL
author
Heiko Schocher
<hs@denx.de>
Wed, 21 Jan 2015 07:38:20 +0000
(08:38 +0100)
committer
Andreas Bießmann
<andreas.devel@googlemail.com>
Sat, 7 Feb 2015 22:43:07 +0000
(23:43 +0100)
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
patch
|
blob
|
history
diff --git
a/arch/arm/cpu/at91-common/spl.c
b/arch/arm/cpu/at91-common/spl.c
index
6473320
..
aaa5eec
100644
(file)
--- 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)
{