summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2013-04-30 09:58:03 -0400
committerTom Rini <trini@ti.com>2013-05-01 10:37:35 -0400
commit92daa4d2cff74d35a8b479c27a419025a464533f (patch)
tree7ea40acf8c6aa7301643e67acc53418050a9a00a /arch
parent19fe4b3e3122071fbe6481df05bd819405e1983e (diff)
parent0f21f98dd4d6bff72df4eeaca4163779896cb336 (diff)
downloadu-boot-imx-92daa4d2cff74d35a8b479c27a419025a464533f.zip
u-boot-imx-92daa4d2cff74d35a8b479c27a419025a464533f.tar.gz
u-boot-imx-92daa4d2cff74d35a8b479c27a419025a464533f.tar.bz2
Merge branch 'microblaze' of git://www.denx.de/git/u-boot-microblaze
Diffstat (limited to 'arch')
-rw-r--r--arch/microblaze/include/asm/processor.h4
-rw-r--r--arch/microblaze/lib/board.c3
2 files changed, 7 insertions, 0 deletions
diff --git a/arch/microblaze/include/asm/processor.h b/arch/microblaze/include/asm/processor.h
index 2c4d5ff..d33faeb 100644
--- a/arch/microblaze/include/asm/processor.h
+++ b/arch/microblaze/include/asm/processor.h
@@ -31,4 +31,8 @@ extern char __text_start[];
/* Microblaze board initialization function */
void board_init(void);
+/* Watchdog functions */
+extern int hw_watchdog_init(void);
+extern void hw_watchdog_disable(void);
+
#endif /* __ASM_MICROBLAZE_PROCESSOR_H */
diff --git a/arch/microblaze/lib/board.c b/arch/microblaze/lib/board.c
index a7c2f76..815fb5a 100644
--- a/arch/microblaze/lib/board.c
+++ b/arch/microblaze/lib/board.c
@@ -61,6 +61,9 @@ init_fnc_t *init_sequence[] = {
serial_init,
console_init_f,
interrupts_init,
+#ifdef CONFIG_XILINX_TB_WATCHDOG
+ hw_watchdog_init,
+#endif
timer_init,
NULL,
};