diff mbox

[U-Boot,1/2] board_f: init designware watchdog if CONFIG_DESIGNWARE_WATCHDOG=y

Message ID 1465820664-10004-1-git-send-email-agust@denx.de
State Accepted
Commit 46d7a3b3d37aed4381765fd6985d06031d0e2a52
Delegated to: Tom Rini
Headers show

Commit Message

Anatolij Gustschin June 13, 2016, 12:24 p.m. UTC 
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(+)

Comments

Tom Rini July 16, 2016, 1:46 p.m. UTC | #1 
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!
diff mbox

Patch

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