diff options
| author | Stefan Roese <sr@denx.de> | 2015-03-10 08:04:36 +0100 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2015-03-13 13:31:56 +0100 |
| commit | 14a380a8f3059a8e66446d0462a39978946c564c (patch) | |
| tree | a7e8490187630e10d35e990ef511a0c29fa8ba03 /common/board_f.c | |
| parent | 9d16c52f62a4cd017ac3530002ccc8ea9ffde58f (diff) | |
| download | talos-obmc-uboot-14a380a8f3059a8e66446d0462a39978946c564c.tar.gz talos-obmc-uboot-14a380a8f3059a8e66446d0462a39978946c564c.zip | |
common/board_f.c: Enable IMX watchdog in init_func_watchdog_init()
Without this patch, the IMX watchdog will not be initialized. And therefor
not active. This patch fixes this by calling hw_watchdog_init() also when
CONFIG_IMX_WATCHDOG is defined.
Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Heiko Schocher <hs@denx.de>
Acked-by: Heiko Schocher <hs@denx.de>
Diffstat (limited to 'common/board_f.c')
| -rw-r--r-- | common/board_f.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/common/board_f.c b/common/board_f.c index 4d8b8a626b..89ce7954ab 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -111,7 +111,8 @@ static int init_func_watchdog_init(void) { # if defined(CONFIG_HW_WATCHDOG) && (defined(CONFIG_BLACKFIN) || \ defined(CONFIG_M68K) || defined(CONFIG_MICROBLAZE) || \ - defined(CONFIG_SH) || defined(CONFIG_AT91SAM9_WATCHDOG)) + defined(CONFIG_SH) || defined(CONFIG_AT91SAM9_WATCHDOG) || \ + defined(CONFIG_IMX_WATCHDOG)) hw_watchdog_init(); # endif puts(" Watchdog enabled\n"); |
