summaryrefslogtreecommitdiff
path: root/common/board_f.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-03-18 07:07:43 -0400
committerTom Rini <trini@konsulko.com>2015-03-18 07:07:43 -0400
commita538ae997ae4cb375ba5362b50ba3f5b35f9519b (patch)
tree3f709a9137f1af222c125e17a0075290dfe740f8 /common/board_f.c
parent8c8dc4c61518124eb35f4dd9d8466378ba247e9c (diff)
parentd5eb6dcf44f5c889dd80c81cf3b06385a27f8baf (diff)
downloadu-boot-imx-a538ae997ae4cb375ba5362b50ba3f5b35f9519b.zip
u-boot-imx-a538ae997ae4cb375ba5362b50ba3f5b35f9519b.tar.gz
u-boot-imx-a538ae997ae4cb375ba5362b50ba3f5b35f9519b.tar.bz2
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'common/board_f.c')
-rw-r--r--common/board_f.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/common/board_f.c b/common/board_f.c
index 731b539..55ede07 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");