aboutsummaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorPatrick Delaunay <patrick.delaunay@st.com>2020-06-11 16:51:17 +0200
committerPatrick Delaunay <patrick.delaunay@st.com>2020-07-07 16:01:23 +0200
commit2ee5005dea1a12bba096abac1f8ebeaea91bf964 (patch)
tree2f0f8160b60625e8fb1ad8a34f1a0e94ad7c7d95 /configs
parentda7a0bb1f279221a85706bee7f75974c83d5e87a (diff)
downloadu-boot-2ee5005dea1a12bba096abac1f8ebeaea91bf964.zip
u-boot-2ee5005dea1a12bba096abac1f8ebeaea91bf964.tar.gz
u-boot-2ee5005dea1a12bba096abac1f8ebeaea91bf964.tar.bz2
configs: stm32mp1: activate WATCHDOG
As kernel v5.6 have a solution since so we will be able to enable the watchdog at boot time. It is reloaded by the watchdog framework (if CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED is set) and until the userspace watchdog daemon takes over control. Need presence of kernel patch 85fdc63fe256 ("drivers: watchdog: stm32_iwdg: set WDOG_HW_RUNNING at probe") integrated in v5.6-rc1. This patch revert the previous commit ca351e705a5c ("stm32mp1: deactivate WATCHDOG in defconfig"). Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com> Reviewed-by: Patrice Chotard <patrice.chotard@st.com>
Diffstat (limited to 'configs')
-rw-r--r--configs/stm32mp15_basic_defconfig2
-rw-r--r--configs/stm32mp15_trusted_defconfig2
2 files changed, 4 insertions, 0 deletions
diff --git a/configs/stm32mp15_basic_defconfig b/configs/stm32mp15_basic_defconfig
index 7347070..4c3bdb6 100644
--- a/configs/stm32mp15_basic_defconfig
+++ b/configs/stm32mp15_basic_defconfig
@@ -144,5 +144,7 @@ CONFIG_VIDEO_STM32=y
CONFIG_VIDEO_STM32_DSI=y
CONFIG_VIDEO_STM32_MAX_XRES=1280
CONFIG_VIDEO_STM32_MAX_YRES=800
+CONFIG_WDT=y
+CONFIG_WDT_STM32MP=y
CONFIG_ERRNO_STR=y
CONFIG_FDT_FIXUP_PARTITIONS=y
diff --git a/configs/stm32mp15_trusted_defconfig b/configs/stm32mp15_trusted_defconfig
index 97a2798..4ca50d6 100644
--- a/configs/stm32mp15_trusted_defconfig
+++ b/configs/stm32mp15_trusted_defconfig
@@ -128,5 +128,7 @@ CONFIG_VIDEO_STM32=y
CONFIG_VIDEO_STM32_DSI=y
CONFIG_VIDEO_STM32_MAX_XRES=1280
CONFIG_VIDEO_STM32_MAX_YRES=800
+CONFIG_WDT=y
+CONFIG_WDT_STM32MP=y
CONFIG_ERRNO_STR=y
CONFIG_FDT_FIXUP_PARTITIONS=y