summaryrefslogtreecommitdiffstats
path: root/arch/arm/cpu/armv7/omap-common/boot-common.c
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2013-10-01 12:32:04 -0400
committerTom Rini <trini@ti.com>2013-11-01 15:55:59 -0400
commit6843918e0035bf06cb65ad2b4c98b38e86e43bd5 (patch)
tree3755d8744e201c51b684e0250ec0d4174b19889f /arch/arm/cpu/armv7/omap-common/boot-common.c
parente1e55c13c965c1c2316cd1540c3e46e1c07fc4ee (diff)
downloadblackbird-obmc-uboot-6843918e0035bf06cb65ad2b4c98b38e86e43bd5.tar.gz
blackbird-obmc-uboot-6843918e0035bf06cb65ad2b4c98b38e86e43bd5.zip
am335x: Enable CONFIG_OMAP_WATCHDOG support
There is a board-specific portion for calling watchdog enable itself, in main U-Boot. Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'arch/arm/cpu/armv7/omap-common/boot-common.c')
-rw-r--r--arch/arm/cpu/armv7/omap-common/boot-common.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/omap-common/boot-common.c b/arch/arm/cpu/armv7/omap-common/boot-common.c
index 0ffa03ac01..69fff323d3 100644
--- a/arch/arm/cpu/armv7/omap-common/boot-common.c
+++ b/arch/arm/cpu/armv7/omap-common/boot-common.c
@@ -14,6 +14,7 @@
#include <asm/arch/omap.h>
#include <asm/arch/mmc_host_def.h>
#include <asm/arch/sys_proto.h>
+#include <watchdog.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -76,6 +77,9 @@ void spl_board_init(void)
#if defined(CONFIG_AM33XX) && defined(CONFIG_SPL_MUSB_NEW_SUPPORT)
arch_misc_init();
#endif
+#if defined(CONFIG_HW_WATCHDOG)
+ hw_watchdog_init();
+#endif
#ifdef CONFIG_AM33XX
am33xx_spl_board_init();
#endif
OpenPOWER on IntegriCloud