diff options
| author | Lukasz Majewski <lukma@denx.de> | 2019-09-03 16:38:45 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2019-10-08 16:35:59 +0200 |
| commit | d5354f59d072210b469f099c8ee313e0f17c28e6 (patch) | |
| tree | 997a4fd3cdc63e96ae126154789f418bc32f7e0c | |
| parent | 1743d6676d2cc50948f7227916d559677e31b546 (diff) | |
DM: WDT: Convert WDT driver to use DM/DTS (including SYSRESET)
This commit enables support for CONFIG_WDT in the U-Boot proper. Moreover,
the SYSRESET_WATCHDOG driver is used to support 'reset' command.
As SPL is not yet ready for DM conversion, the CONFIG_HW_WATCHDOG is
enabled for it. This allows the legacy SPL code to work properly.
Signed-off-by: Lukasz Majewski <lukma@denx.de>
| -rw-r--r-- | arch/arm/dts/imx6q-display5-u-boot.dtsi | 5 | ||||
| -rw-r--r-- | configs/display5_defconfig | 3 | ||||
| -rw-r--r-- | include/configs/display5.h | 6 |
3 files changed, 13 insertions, 1 deletions
diff --git a/arch/arm/dts/imx6q-display5-u-boot.dtsi b/arch/arm/dts/imx6q-display5-u-boot.dtsi index b942218b7a..aa660b5aeb 100644 --- a/arch/arm/dts/imx6q-display5-u-boot.dtsi +++ b/arch/arm/dts/imx6q-display5-u-boot.dtsi @@ -31,6 +31,11 @@ chosen { stdout-path = &uart5; }; + + wdt-reboot { + compatible = "wdt-reboot"; + wdt = <&wdog1>; + }; }; &i2c3 { diff --git a/configs/display5_defconfig b/configs/display5_defconfig index 875ccce1c8..46bcdaffc8 100644 --- a/configs/display5_defconfig +++ b/configs/display5_defconfig @@ -49,6 +49,7 @@ CONFIG_CMD_PART=y # CONFIG_CMD_PINMUX is not set CONFIG_CMD_SF=y CONFIG_CMD_SPI=y +CONFIG_CMD_WDT=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y @@ -107,5 +108,7 @@ CONFIG_DM_REGULATOR_PFUZE100=y CONFIG_MXC_UART=y CONFIG_SPI=y CONFIG_MXC_SPI=y +CONFIG_SYSRESET=y +CONFIG_SYSRESET_WATCHDOG=y CONFIG_I2C_EDID=y CONFIG_IMX_WATCHDOG=y diff --git a/include/configs/display5.h b/include/configs/display5.h index bbcb5da7bb..de11ff61c6 100644 --- a/include/configs/display5.h +++ b/include/configs/display5.h @@ -342,7 +342,11 @@ /* Watchdog */ #define CONFIG_WATCHDOG_TIMEOUT_MSECS 15000 - +#if defined(CONFIG_SPL_BUILD) +#undef CONFIG_WDT +#undef CONFIG_WATCHDOG +#define CONFIG_HW_WATCHDOG +#endif /* ENV config */ #ifdef CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SIZE (SZ_64K) |