projects
/
project
/
bcm63xx
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9d16c52
)
common/board_f.c: Enable IMX watchdog in init_func_watchdog_init()
author
Stefan Roese
<
[email protected]
>
Tue, 10 Mar 2015 07:04:36 +0000
(08:04 +0100)
committer
Stefano Babic
<
[email protected]
>
Fri, 13 Mar 2015 12:31:56 +0000
(13:31 +0100)
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 <
[email protected]
>
Cc: Simon Glass <
[email protected]
>
Cc: Fabio Estevam <
[email protected]
>
Cc: Stefano Babic <
[email protected]
>
Cc: Heiko Schocher <
[email protected]
>
Acked-by: Heiko Schocher <
[email protected]
>
common/board_f.c
patch
|
blob
|
history
diff --git
a/common/board_f.c
b/common/board_f.c
index 4d8b8a626becb3a3685a9f18bad66bc96e0dfeb6..89ce7954ab8c48f8564c2098e7552a4a9b6aad0a 100644
(file)
--- 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");