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 /include | |
| parent | aa159e681ec22a19ee4dd68ad4ec08b748e14d10 (diff) | |
| parent | e3917b21c05776b41663bdfcc7666aca11a381a0 (diff) | |
| download | u-boot-imx-dcdb61a084bd3840d0987a5d01ae506c11efca1b.zip u-boot-imx-dcdb61a084bd3840d0987a5d01ae506c11efca1b.tar.gz u-boot-imx-dcdb61a084bd3840d0987a5d01ae506c11efca1b.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/km/kmp204x-common.h | 8 | ||||
| -rw-r--r-- | include/watchdog.h | 4 |
2 files changed, 12 insertions, 0 deletions
diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h index efd9635..a0f9d29 100644 --- a/include/configs/km/kmp204x-common.h +++ b/include/configs/km/kmp204x-common.h @@ -377,6 +377,14 @@ int get_scl(void); #define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */ /* + * Hardware Watchdog + */ +#define CONFIG_WATCHDOG /* enable CPU watchdog */ +#define CONFIG_WATCHDOG_PRESC 34 /* wdog prescaler 2^(64-34) (~10min) */ +#define CONFIG_WATCHDOG_RC WRC_CHIP /* reset chip on watchdog event */ + + +/* * additionnal command line configuration. */ #define CONFIG_CMD_PCI diff --git a/include/watchdog.h b/include/watchdog.h index aacacb9..bd0a8d6 100644 --- a/include/watchdog.h +++ b/include/watchdog.h @@ -95,4 +95,8 @@ int init_func_watchdog_reset(void); #if defined(CONFIG_HW_WATCHDOG) && !defined(__ASSEMBLY__) void hw_watchdog_init(void); #endif + +#if defined(CONFIG_MPC85xx) && !defined(__ASSEMBLY__) + void init_85xx_watchdog(void); +#endif #endif /* _WATCHDOG_H_ */ |