diff options
| author | Tom Rini <trini@konsulko.com> | 2019-07-27 09:35:05 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-07-27 09:35:05 -0400 |
| commit | df9a7a195bdf0722399199bf373afc8309ae3ad7 (patch) | |
| tree | 5bf1e2e3388725131640aac7d120647820ca5b48 /common/spl | |
| parent | 222701e157176a66628e4f399f52ca3307b018c9 (diff) | |
| parent | 4a6f5b4f56b8bc6f36736fc0a07c5c4f9069e69b (diff) | |
Merge tag 'u-boot-imx-20190719' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
u-boot-imx-20190719
- CCF for i.MX6
- nandbcb command to write SPL into NAND
- Switch to DM (i.MX28)
- Boards: Toradex, engicam, DH
- Fixes for i.MX8
- Fixes for i.MX7ULP
Travis: https://travis-ci.org/sbabic/u-boot-imx/builds/561147504
Diffstat (limited to 'common/spl')
| -rw-r--r-- | common/spl/Kconfig | 1 | ||||
| -rw-r--r-- | common/spl/spl.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 5d6da5db89..54154b93c9 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -1075,6 +1075,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 |