| Message ID | 20191129075906.1724-3-ch@denx.de |
|---|---|
| State | Accepted |
| Commit | 04886b36eb72f9deda5deaf21b31777fda828af9 |
| Delegated to: | Stefano Babic |
| Headers | show |
| Series | ARM: imx6: DHCOM i.MX6 PDK: Fixing reset | expand |
> 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> Applied to u-boot-imx, -next, thanks ! Best regards, Stefano Babic
diff --git a/configs/dh_imx6_defconfig b/configs/dh_imx6_defconfig index 4055812007..e5c44381b2 100644 --- a/configs/dh_imx6_defconfig +++ b/configs/dh_imx6_defconfig @@ -37,6 +37,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 @@ -77,6 +78,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 d4bd88f511..77074aaa06 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
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> --- configs/dh_imx6_defconfig | 3 +++ include/configs/dh_imx6.h | 5 +++++ 2 files changed, 8 insertions(+)