summaryrefslogtreecommitdiff
path: root/arch/powerpc/lib
diff options
context:
space:
mode:
authorBoschung, Rainer <Rainer.Boschung@keymile.com>2014-06-03 09:05:15 +0200
committerYork Sun <yorksun@freescale.com>2014-08-01 14:18:28 -0700
commit919e05520fbf5c32d3a5d19756449dfd4706cd94 (patch)
tree12b53f4aa769c69d4d2232cd6ad5627a1c8f06d7 /arch/powerpc/lib
parent0f8062b25b31988bf62f166aa5b988add8454e42 (diff)
downloadu-boot-imx-919e05520fbf5c32d3a5d19756449dfd4706cd94.zip
u-boot-imx-919e05520fbf5c32d3a5d19756449dfd4706cd94.tar.gz
u-boot-imx-919e05520fbf5c32d3a5d19756449dfd4706cd94.tar.bz2
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 <rainer.boschung@keymile.com> Reviewed-by: York Sun <yorksun@freescale.com>
Diffstat (limited to 'arch/powerpc/lib')
-rw-r--r--arch/powerpc/lib/board.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/lib/board.c b/arch/powerpc/lib/board.c
index 50eb820..0296205 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;