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 /arch/blackfin/lib | |
| parent | 13262d4cdab79b6ee8d9c6089f84132a4c9372a4 (diff) | |
| download | talos-obmc-uboot-e9a389a18477c1c57a0b30e9ea8f4d38c6e26e63.tar.gz talos-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 'arch/blackfin/lib')
| -rw-r--r-- | arch/blackfin/lib/board.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/blackfin/lib/board.c b/arch/blackfin/lib/board.c index 85b859df72..f1d55470e8 100644 --- a/arch/blackfin/lib/board.c +++ b/arch/blackfin/lib/board.c @@ -279,9 +279,9 @@ void board_init_f(ulong bootflag) dcache_enable(); #endif -#ifdef CONFIG_WATCHDOG +#ifdef CONFIG_HW_WATCHDOG serial_early_puts("Setting up external watchdog\n"); - watchdog_init(); + hw_watchdog_init(); #endif #ifdef DEBUG |
