[U-Boot] [PATCH] 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 --- common/board_f.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
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) hw_watchdog_init(); # endif puts(" Watchdog enabled\n");
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 sr@denx.de Cc: Simon Glass sjg@chromium.org Cc: Fabio Estevam fabio.estevam@freescale.com Cc: Stefano Babic sbabic@denx.de
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
Hi Heiko,
On 10.03.2015 07:17, Heiko Schocher wrote:
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 sr@denx.de Cc: Simon Glass sjg@chromium.org Cc: Fabio Estevam fabio.estevam@freescale.com Cc: Stefano Babic sbabic@denx.de
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?
Right. Even though checking for CONFIG_HW_WATCHDOG & IMX_WATCHDOG seems a bit redundant. But such a cleanup is perhaps better done in a different patch.
Thanks for the review. I'll send a v2 right away...
Thanks, Stefan
participants (2)
-
Heiko Schocher -
Stefan Roese