From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heiko Schocher Date: Tue, 10 Mar 2015 07:17:51 +0100 Subject: [U-Boot] [PATCH] common/board_f.c: Enable IMX watchdog in init_func_watchdog_init() In-Reply-To: <1425916182-12023-1-git-send-email-sr@denx.de> References: <1425916182-12023-1-git-send-email-sr@denx.de> Message-ID: <54FE8C8F.7020100@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hello Stefan, Am 09.03.2015 16:49, schrieb Stefan Roese: > 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 > Cc: Simon Glass > Cc: Fabio Estevam > Cc: Stefano Babic > --- > common/board_f.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) Thanks, Good catch! > diff --git a/common/board_f.c b/common/board_f.c > index 4d8b8a6..1dfaa2a 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) Hmm.. are you sure, you set the brackets correct? I think it should be: - defined(CONFIG_SH) || defined(CONFIG_AT91SAM9_WATCHDOG)) + defined(CONFIG_SH) || defined(CONFIG_AT91SAM9_WATCHDOG) || \ ^ + defined(CONFIG_IMX_WATCHDOG)) ^ so it only gets enabled if CONFIG_HW_WATCHDOG is defined ... or is this not necessary for imx6? bye, Heiko -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany