From 919e05520fbf5c32d3a5d19756449dfd4706cd94 Mon Sep 17 00:00:00 2001 From: "Boschung, Rainer" Date: Tue, 3 Jun 2014 09:05:15 +0200 Subject: powerpc: mpc85xx watchdog init added to init_func When CONFIG_WATCHDOG is defined the board initialization just performs a WATCHDOG_RESET, an initialization of the watchdog is not done. This has been modified fot the MPC85xx, the board initialization calls its watchdog initialitzation allowing for full watchdog configuration very early in the boot phase. Signed-off-by: Rainer Boschung Reviewed-by: York Sun --- arch/powerpc/lib/board.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'arch/powerpc/lib/board.c') diff --git a/arch/powerpc/lib/board.c b/arch/powerpc/lib/board.c index 50eb820336..02962054f6 100644 --- a/arch/powerpc/lib/board.c +++ b/arch/powerpc/lib/board.c @@ -226,6 +226,9 @@ static int init_func_spi(void) #if defined(CONFIG_WATCHDOG) int init_func_watchdog_init(void) { +#if defined(CONFIG_MPC85xx) + init_85xx_watchdog(); +#endif puts(" Watchdog enabled\n"); WATCHDOG_RESET(); return 0; -- cgit