From 2ee5005dea1a12bba096abac1f8ebeaea91bf964 Mon Sep 17 00:00:00 2001 From: Patrick Delaunay Date: Thu, 11 Jun 2020 16:51:17 +0200 Subject: [PATCH] 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 Reviewed-by: Patrice Chotard --- configs/stm32mp15_basic_defconfig | 2 ++ configs/stm32mp15_trusted_defconfig | 2 ++ 2 files changed, 4 insertions(+) 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 -- 2.7.4