diff options
| author | Sonic Zhang <sonic.zhang@analog.com> | 2013-04-07 18:02:37 +0800 |
|---|---|---|
| committer | Sonic Zhang <sonic.zhang@analog.com> | 2013-05-13 16:30:26 +0800 |
| commit | e9a389a18477c1c57a0b30e9ea8f4d38c6e26e63 (patch) | |
| tree | 4e0c9e5c15d316a8e16c10c428e44e41bf58e1b5 /include | |
| parent | 13262d4cdab79b6ee8d9c6089f84132a4c9372a4 (diff) | |
| download | blackbird-obmc-uboot-e9a389a18477c1c57a0b30e9ea8f4d38c6e26e63.tar.gz blackbird-obmc-uboot-e9a389a18477c1c57a0b30e9ea8f4d38c6e26e63.zip | |
blackfin: Move blackfin watchdog driver out of the blackfin arch folder.
- Enable hw_watchdog_init() in watchdog.h if CONFIG_HW_WATCHDOG is defined.
- Move blackfin hw watchdog driver to the generic driver folder.
- Call hw_watchdog_init() from blackfin board init code.
- Reuse macro CONFIG_WATCHDOG_TIMEOUT_MSECS
- Update README.watchdog accordingly
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/bfin_adi_common.h | 6 | ||||
| -rw-r--r-- | include/watchdog.h | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/include/configs/bfin_adi_common.h b/include/configs/bfin_adi_common.h index c986ba3d3e..0bcccf831b 100644 --- a/include/configs/bfin_adi_common.h +++ b/include/configs/bfin_adi_common.h @@ -314,5 +314,11 @@ #define CONFIG_BFIN_SPI_GPIO_CS /* Only matters if BFIN_SPI is enabled */ #define CONFIG_LZMA #define CONFIG_MONITOR_IS_IN_RAM +#ifdef CONFIG_HW_WATCHDOG +# define CONFIG_BFIN_WATCHDOG +# ifndef CONFIG_WATCHDOG_TIMEOUT_MSECS +# define CONFIG_WATCHDOG_TIMEOUT_MSECS 5000 +# endif +#endif #endif diff --git a/include/watchdog.h b/include/watchdog.h index 97ec186be3..d95e4b164d 100644 --- a/include/watchdog.h +++ b/include/watchdog.h @@ -108,8 +108,7 @@ int init_func_watchdog_reset(void); void reset_4xx_watchdog(void); #endif -/* Freescale i.MX */ -#if defined(CONFIG_IMX_WATCHDOG) && !defined(__ASSEMBLY__) +#if defined(CONFIG_HW_WATCHDOG) && !defined(__ASSEMBLY__) void hw_watchdog_init(void); #endif #endif /* _WATCHDOG_H_ */ |
