From a46a36a4cfebe5977360216ded7b0e779b92cb44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20J=C3=A4ger?= Date: Thu, 20 May 2021 07:42:06 +0200 Subject: [PATCH] task_wdt: Pause hardware wdt during debugging MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Enable the option to pause the fallback hardware watchdog if the MCU is halted by a debugger. This fixes issue #33509 where some boards with Nordic MCUs could not be flashed anymore after using the task watchdog sample. Signed-off-by: Martin Jäger --- subsys/task_wdt/task_wdt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/subsys/task_wdt/task_wdt.c b/subsys/task_wdt/task_wdt.c index e4f6068a267..24a612787b9 100644 --- a/subsys/task_wdt/task_wdt.c +++ b/subsys/task_wdt/task_wdt.c @@ -131,7 +131,8 @@ int task_wdt_add(uint32_t reload_period, task_wdt_callback_t callback, #ifdef CONFIG_TASK_WDT_HW_FALLBACK if (!hw_wdt_started && hw_wdt_dev) { /* also start fallback hw wdt */ - wdt_setup(hw_wdt_dev, 0); + wdt_setup(hw_wdt_dev, + WDT_OPT_PAUSE_HALTED_BY_DBG); hw_wdt_started = true; } #endif