From: Stefan Roese <sr@denx.de>
Date: Tue, 10 Mar 2015 07:04:36 +0000 (+0100)
Subject: common/board_f.c: Enable IMX watchdog in init_func_watchdog_init()
X-Git-Tag: v2015.04-rc5~64^2~4
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=14a380a8f3059a8e66446d0462a39978946c564c;p=u-boot

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>
---

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");