diff options
| author | Claudius Heine <ch@denx.de> | 2019-11-29 08:59:03 +0100 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2020-01-07 10:26:56 +0100 |
| commit | 04886b36eb72f9deda5deaf21b31777fda828af9 (patch) | |
| tree | ad3a109bc4f486d47afc7deae558f96c18b5f9b5 | |
| parent | f8420d7c0f706989905b1f1e1581aba26c595fe4 (diff) | |
| download | u-boot-04886b36eb72f9deda5deaf21b31777fda828af9.tar.gz | |
ARM: imx6: DHCOM i.MX6 PDK: Enable sysreset driver and wdt command
The SPL does not have DM enabled and therefor still needs to use the
hardware watchdog interface provided by the imx-watchdog driver.
Fixes: broken reset command after f2929d11a639 ("watchdog: imx: Use
immediate reset bits for expire_now")
Signed-off-by: Claudius Heine <ch@denx.de>
| -rw-r--r-- | configs/dh_imx6_defconfig | 3 | ||||
| -rw-r--r-- | include/configs/dh_imx6.h | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/configs/dh_imx6_defconfig b/configs/dh_imx6_defconfig index 0a38da619a..db5152dd16 100644 --- a/configs/dh_imx6_defconfig +++ b/configs/dh_imx6_defconfig @@ -40,6 +40,7 @@ CONFIG_CMD_MMC=y CONFIG_CMD_SATA=y CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y +CONFIG_CMD_WDT=y CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y CONFIG_CMD_EXT4_WRITE=y @@ -83,6 +84,8 @@ CONFIG_DM_SCSI=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_MXC_SPI=y +CONFIG_SYSRESET=y +CONFIG_SYSRESET_WATCHDOG=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_GADGET=y diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h index d762d2cb19..087d020cdd 100644 --- a/include/configs/dh_imx6.h +++ b/include/configs/dh_imx6.h @@ -87,6 +87,11 @@ #endif /* Watchdog */ +#if defined(CONFIG_SPL_BUILD) +#undef CONFIG_WDT +#undef CONFIG_WATCHDOG +#define CONFIG_HW_WATCHDOG +#endif /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE |