dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-28 22:11:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

DM: WDT: Convert WDT driver to use DM/DTS (including SYSRESET)

Browse Source 
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>
This commit is contained in:
Lukasz Majewski
2019-09-03 16:38:45 +02:00
committed by Stefano Babic
parent 1743d6676d
commit d5354f59d0
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/dts/imx6q-display5-u-boot.dtsi
View File

@@ -31,6 +31,11 @@
chosen { chosen {
stdout-path = &uart5; stdout-path = &uart5;
}; };
wdt-reboot {
compatible = "wdt-reboot";
wdt = <&wdog1>;
};
}; };
&i2c3 { &i2c3 {

3
configs/display5_defconfig
View File

@@ -49,6 +49,7 @@ CONFIG_CMD_PART=y
# CONFIG_CMD_PINMUX is not set # CONFIG_CMD_PINMUX is not set
CONFIG_CMD_SF=y CONFIG_CMD_SF=y
CONFIG_CMD_SPI=y CONFIG_CMD_SPI=y
CONFIG_CMD_WDT=y
CONFIG_CMD_DHCP=y CONFIG_CMD_DHCP=y
CONFIG_CMD_MII=y CONFIG_CMD_MII=y
CONFIG_CMD_PING=y CONFIG_CMD_PING=y
@@ -107,5 +108,7 @@ CONFIG_DM_REGULATOR_PFUZE100=y
CONFIG_MXC_UART=y CONFIG_MXC_UART=y
CONFIG_SPI=y CONFIG_SPI=y
CONFIG_MXC_SPI=y CONFIG_MXC_SPI=y
CONFIG_SYSRESET=y
CONFIG_SYSRESET_WATCHDOG=y
CONFIG_I2C_EDID=y CONFIG_I2C_EDID=y
CONFIG_IMX_WATCHDOG=y CONFIG_IMX_WATCHDOG=y

6
include/configs/display5.h
View File

@@ -342,7 +342,11 @@
/* Watchdog */ /* Watchdog */
#define CONFIG_WATCHDOG_TIMEOUT_MSECS 15000 #define CONFIG_WATCHDOG_TIMEOUT_MSECS 15000
#if defined(CONFIG_SPL_BUILD)
#undef CONFIG_WDT
#undef CONFIG_WATCHDOG
#define CONFIG_HW_WATCHDOG
#endif
/* ENV config */ /* ENV config */
#ifdef CONFIG_ENV_IS_IN_SPI_FLASH #ifdef CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_SIZE (SZ_64K) #define CONFIG_ENV_SIZE (SZ_64K)