summaryrefslogtreecommitdiff
path: root/common/spl
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2019-06-09 03:46:21 +0200
committerStefano Babic <sbabic@denx.de>2019-07-19 20:14:50 +0200
commit6874cb72204ffbdbe4290baae11d0b9b8ed47ed1 (patch)
tree9c210495bec100440da3dc0957afc7bb80a3d509 /common/spl
parent41d185d142365625700f2df5d5d7b237da4bc58d (diff)
watchdog: Split WDT from SPL_WDT
Use CONFIG_IS_ENABLED(WDT) to permit use of WDT in SPL without DM, while the full U-Boot can use rich DM/DT WDT driver. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Peng Fan <Peng.Fan@freescale.com> Cc: Stefano Babic <sbabic@denx.de> Tested-by: Heiko Schocher <hs@denx.de> Tested-by: Suniel Mahesh <sunil.m@techveda.org>
Diffstat (limited to 'common/spl')
-rw-r--r--common/spl/Kconfig1
-rw-r--r--common/spl/spl.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 5978fb2934..81bd908f9b 100644
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -1061,6 +1061,7 @@ endif
config SPL_WATCHDOG_SUPPORT
bool "Support watchdog drivers"
+ imply SPL_WDT if !HW_WATCHDOG
help
Enable support for watchdog drivers in SPL. A watchdog is
typically a hardware peripheral which can reset the system when it
diff --git a/common/spl/spl.c b/common/spl/spl.c
index d5e3f680f4..c182705b3f 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -603,7 +603,7 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
spl_board_init();
#endif
-#if defined(CONFIG_SPL_WATCHDOG_SUPPORT) && defined(CONFIG_WDT)
+#if defined(CONFIG_SPL_WATCHDOG_SUPPORT) && CONFIG_IS_ENABLED(WDT)
initr_watchdog();
#endif