diff options
| author | Tom Rini | 2022-10-26 07:45:55 -0400 |
|---|---|---|
| committer | Tom Rini | 2022-10-26 07:45:55 -0400 |
| commit | c2c485db455696850f17a874f8b5a11d13b31b5c (patch) | |
| tree | 291e7cd1007f6cdf6e514c21edd5c2e5fa9a0a2e /configs | |
| parent | f9d16f2c0daf68dcb963c08c927f5f0a07cf75e4 (diff) | |
| parent | 5e112c7ca8ee45860e27f23059d9a319ba8eb6d3 (diff) | |
Merge https://source.denx.de/u-boot/custodians/u-boot-watchdog
- nuvoton: add expire function for generic reset (Jim)
- handle watchdogs during keyed autoboot (Rasmus)
- cyclic: Don't disable cylic function upon exceeding CPU time (Stefan)
- ulp wdog: Updates to support iMX93 and DM (Alice)
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/sandbox64_defconfig | 2 | ||||
| -rw-r--r-- | configs/sandbox_defconfig | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/configs/sandbox64_defconfig b/configs/sandbox64_defconfig index 48a7fd2bc22..04756729682 100644 --- a/configs/sandbox64_defconfig +++ b/configs/sandbox64_defconfig @@ -56,6 +56,7 @@ CONFIG_CMD_REMOTEPROC=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y CONFIG_CMD_CAT=y +CONFIG_CMD_WDT=y CONFIG_BOOTP_DNS2=y CONFIG_CMD_TFTPPUT=y CONFIG_CMD_TFTPSRV=y @@ -238,6 +239,7 @@ CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_WDT=y CONFIG_WDT_GPIO=y CONFIG_WDT_SANDBOX=y +CONFIG_WDT_ALARM_SANDBOX=y CONFIG_FS_CBFS=y CONFIG_FS_CRAMFS=y CONFIG_CMD_DHRYSTONE=y diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index e18e666f126..34e90674eec 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -80,6 +80,7 @@ CONFIG_CMD_REMOTEPROC=y CONFIG_CMD_SPI=y CONFIG_CMD_TEMPERATURE=y CONFIG_CMD_USB=y +CONFIG_CMD_WDT=y CONFIG_CMD_AXI=y CONFIG_CMD_CAT=y CONFIG_CMD_SETEXPR_FMT=y @@ -314,6 +315,7 @@ CONFIG_W1_EEPROM_SANDBOX=y CONFIG_WDT=y CONFIG_WDT_GPIO=y CONFIG_WDT_SANDBOX=y +CONFIG_WDT_ALARM_SANDBOX=y CONFIG_FS_CBFS=y CONFIG_FS_CRAMFS=y CONFIG_ADDR_MAP=y |