[U-Boot] [PATCH 1/2] board_f: init designware watchdog if CONFIG_DESIGNWARE_WATCHDOG=y
The designware watchdog init is skipped even if CONFIG_DESIGNWARE_WATCHDOG is enabled. Fix it.
Signed-off-by: Anatolij Gustschin agust@denx.de --- common/board_f.c | 1 + 1 file changed, 1 insertion(+)
diff --git a/common/board_f.c b/common/board_f.c index 622093a..0e2e6bc 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -117,6 +117,7 @@ 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_DESIGNWARE_WATCHDOG) || \ defined(CONFIG_IMX_WATCHDOG)) hw_watchdog_init(); # endif
Output the "Watchdog enabled" message only if hw_watchdog_init() call really happened.
Signed-off-by: Anatolij Gustschin agust@denx.de --- common/board_f.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/board_f.c b/common/board_f.c index 0e2e6bc..9f6e4cc 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -120,8 +120,8 @@ static int init_func_watchdog_init(void) defined(CONFIG_DESIGNWARE_WATCHDOG) || \ defined(CONFIG_IMX_WATCHDOG)) hw_watchdog_init(); -# endif puts(" Watchdog enabled\n"); +# endif WATCHDOG_RESET();
return 0;
On Mon, Jun 13, 2016 at 02:24:24PM +0200, Anatolij Gustschin wrote:
Output the "Watchdog enabled" message only if hw_watchdog_init() call really happened.
Signed-off-by: Anatolij Gustschin agust@denx.de
Applied to u-boot/master, thanks!
On Mon, Jun 13, 2016 at 02:24:23PM +0200, Anatolij Gustschin wrote:
The designware watchdog init is skipped even if CONFIG_DESIGNWARE_WATCHDOG is enabled. Fix it.
Signed-off-by: Anatolij Gustschin agust@denx.de
Applied to u-boot/master, thanks!
participants (2)
-
Anatolij Gustschin -
Tom Rini