diff options
| author | Tom Rini <trini@ti.com> | 2014-08-04 13:35:50 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-08-06 08:38:18 -0400 |
| commit | dcdb61a084bd3840d0987a5d01ae506c11efca1b (patch) | |
| tree | 576fed73a7425aff29b2833ea7a132a1fc373c43 /arch/powerpc/lib/board.c | |
| parent | aa159e681ec22a19ee4dd68ad4ec08b748e14d10 (diff) | |
| parent | e3917b21c05776b41663bdfcc7666aca11a381a0 (diff) | |
| download | u-boot-dcdb61a084bd3840d0987a5d01ae506c11efca1b.tar.gz u-boot-dcdb61a084bd3840d0987a5d01ae506c11efca1b.tar.xz u-boot-dcdb61a084bd3840d0987a5d01ae506c11efca1b.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'arch/powerpc/lib/board.c')
| -rw-r--r-- | arch/powerpc/lib/board.c | 3 |
1 files changed, 3 insertions, 0 deletions
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; |