diff options
| author | Tom Rini <trini@konsulko.com> | 2021-08-31 19:11:15 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-08-31 19:11:15 -0400 |
| commit | e2e5eec6ce1c2cb496a2a5e019a175a9fbdbed2a (patch) | |
| tree | a7f70892693eb02a9e23529c8ded4aea98af64a1 /configs | |
| parent | df6cf3d809fe543651e6bdf133baaa8b9841fe0f (diff) | |
| parent | 4171c574721f3790b416b57d6a536cf3238d5849 (diff) | |
| download | u-boot-e2e5eec6ce1c2cb496a2a5e019a175a9fbdbed2a.tar.gz u-boot-e2e5eec6ce1c2cb496a2a5e019a175a9fbdbed2a.tar.bz2 u-boot-e2e5eec6ce1c2cb496a2a5e019a175a9fbdbed2a.zip | |
Merge branch 'next' of https://gitlab.denx.de/u-boot/custodians/u-boot-marvell into next
- Handling all DM watchdogs in watchdog_reset() (Rasmus)
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 846417d083..df9633d762 100644 --- a/configs/sandbox64_defconfig +++ b/configs/sandbox64_defconfig @@ -225,7 +225,9 @@ CONFIG_OSD=y CONFIG_SANDBOX_OSD=y CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_VIDEO_BMP_RLE8=y +# CONFIG_WATCHDOG_AUTOSTART is not set CONFIG_WDT=y +CONFIG_WDT_GPIO=y CONFIG_WDT_SANDBOX=y CONFIG_FS_CBFS=y CONFIG_FS_CRAMFS=y diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index dd2f8e9b8e..f1067b9ada 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -283,7 +283,9 @@ CONFIG_W1=y CONFIG_W1_GPIO=y CONFIG_W1_EEPROM=y CONFIG_W1_EEPROM_SANDBOX=y +# CONFIG_WATCHDOG_AUTOSTART is not set CONFIG_WDT=y +CONFIG_WDT_GPIO=y CONFIG_WDT_SANDBOX=y CONFIG_FS_CBFS=y CONFIG_FS_CRAMFS=y |