boot: zephyr: Move watchdog code to separate file

Moves the code for this functionality to a separate file so it
can be fixed from a central location and replaced by modules

Signed-off-by: Jamie McCrae <[email protected]>

Author: thedjnK

boot/zephyr/CMakeLists.txt

@@ -71,6 +71,7 @@ zephyr_library_sources(
   flash_map_extended.c
   os.c
   keys.c
+  watchdog.c
   )
 
 if(DEFINED CONFIG_ENABLE_MGMT_PERUSER)

boot/zephyr/include/mcuboot_config/mcuboot_config.h

@@ -11,6 +11,7 @@
 #define __MCUBOOT_CONFIG_H__
 
 #include <zephyr/devicetree.h>
+#include <watchdog.h>
 
 #ifdef CONFIG_BOOT_SIGNATURE_TYPE_RSA
 #define MCUBOOT_SIGN_RSA
@@ -442,85 +443,6 @@
 #define MCUBOOT_BOOTUTIL_LIB_FOR_DIRECT_XIP 1
 #endif
 
-#if CONFIG_BOOT_WATCHDOG_FEED
-#if CONFIG_BOOT_WATCHDOG_FEED_NRFX_WDT
-#include <nrfx_wdt.h>
-
-#define FEED_WDT_INST(inst)                                  \
-    do {                                                     \
-        for (uint8_t i = 0; i < NRF_WDT_CHANNEL_NUMBER; i++) \
-        {                                                    \
-            nrf_wdt_reload_request_set(inst,                 \
-                (nrf_wdt_rr_register_t)(NRF_WDT_RR0 + i));   \
-        }                                                    \
-    } while (0)
-#if defined(NRF_WDT0) && defined(NRF_WDT1)
-#define MCUBOOT_WATCHDOG_FEED()  \
-    do {                         \
-        FEED_WDT_INST(NRF_WDT0); \
-        FEED_WDT_INST(NRF_WDT1); \
-    } while (0)
-#elif defined(NRF_WDT0)
-#define MCUBOOT_WATCHDOG_FEED() \
-    FEED_WDT_INST(NRF_WDT0);
-#elif defined(NRF_WDT30) && defined(NRF_WDT31)
-#define MCUBOOT_WATCHDOG_FEED()   \
-    do {                          \
-        FEED_WDT_INST(NRF_WDT30); \
-        FEED_WDT_INST(NRF_WDT31); \
-    } while (0)
-#elif defined(NRF_WDT30)
-#define MCUBOOT_WATCHDOG_FEED() \
-    FEED_WDT_INST(NRF_WDT30);
-#elif defined(NRF_WDT31)
-#define MCUBOOT_WATCHDOG_FEED() \
-    FEED_WDT_INST(NRF_WDT31);
-#elif defined(NRF_WDT010)
-#define MCUBOOT_WATCHDOG_FEED() \
-    FEED_WDT_INST(NRF_WDT010);
-#else
-#error "No NRFX WDT instances enabled"
-#endif
-
-#elif DT_NODE_HAS_STATUS(DT_ALIAS(watchdog0), okay) /* CONFIG_BOOT_WATCHDOG_FEED_NRFX_WDT */
-#include <zephyr/device.h>
-#include <zephyr/drivers/watchdog.h>
-
-#define MCUBOOT_WATCHDOG_SETUP()                              \
-    do {                                                      \
-        const struct device* wdt =                            \
-            DEVICE_DT_GET(DT_ALIAS(watchdog0));               \
-        if (device_is_ready(wdt)) {                           \
-            wdt_setup(wdt, 0);                                \
-        }                                                     \
-    } while (0)
-
-#define MCUBOOT_WATCHDOG_FEED()                               \
-    do {                                                      \
-        const struct device* wdt =                            \
-            DEVICE_DT_GET(DT_ALIAS(watchdog0));               \
-        if (device_is_ready(wdt)) {                           \
-            wdt_feed(wdt, 0);                                 \
-        }                                                     \
-    } while (0)
-#else /* DT_NODE_HAS_STATUS(DT_ALIAS(watchdog0), okay) */
-/* No vendor implementation, no-op for historical reasons */
-#define MCUBOOT_WATCHDOG_FEED()         \
-    do {                                \
-    } while (0)
-#endif
-#else  /* CONFIG_BOOT_WATCHDOG_FEED */
-/* Not enabled, no feed activity */
-#define MCUBOOT_WATCHDOG_FEED()         \
-    do {                                \
-    } while (0)
-
-#endif /* CONFIG_BOOT_WATCHDOG_FEED */
-
-#ifndef MCUBOOT_WATCHDOG_SETUP
-#define MCUBOOT_WATCHDOG_SETUP()
-#endif
-
 #define MCUBOOT_CPU_IDLE() \
   if (!IS_ENABLED(CONFIG_MULTITHREADING)) { \
     k_cpu_idle(); \

boot/zephyr/include/watchdog.h

@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2025, Jamie McCrae
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/** Set watchdog timer up and active it ready for feeding. */
+void mcuboot_watchdog_setup(void);
+
+/** Feed active watchdog to prevent timeout. */
+void mcuboot_watchdog_feed(void);
+
+#define MCUBOOT_WATCHDOG_SETUP() mcuboot_watchdog_setup()
+#define MCUBOOT_WATCHDOG_FEED() mcuboot_watchdog_feed()

boot/zephyr/watchdog.c

@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2019-2023 MCUboot authors
+ * Copyright (c) 2021-2023 Nordic Semiconductor ASA
+ * Copyright (c) 2025 Jamie McCrae
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <watchdog.h>
+#include <bootutil/bootutil_log.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/watchdog.h>
+
+#ifdef CONFIG_BOOT_WATCHDOG_FEED_NRFX_WDT
+#include <nrfx_wdt.h>
+#endif
+
+BOOT_LOG_MODULE_DECLARE(mcuboot);
+
+__weak void mcuboot_watchdog_setup(void)
+{
+#if defined(CONFIG_WATCHDOG) && DT_NODE_HAS_STATUS(DT_ALIAS(watchdog0), okay)
+    const struct device *watchdog_device = DEVICE_DT_GET(DT_ALIAS(watchdog0));
+
+    if (device_is_ready(watchdog_device)) {
+        int rc;
+
+        rc = wdt_setup(watchdog_device, 0);
+
+        if (rc != 0) {
+            BOOT_LOG_ERR("Watchdog setup failed: %d", rc);
+        }
+    }
+#endif
+}
+
+__weak void mcuboot_watchdog_feed(void)
+{
+#if CONFIG_BOOT_WATCHDOG_FEED_NRFX_WDT
+#define FEED_NRFX_WDT_INST(inst)                             \
+    do {                                                     \
+        for (uint8_t i = 0; i < NRF_WDT_CHANNEL_NUMBER; i++) \
+        {                                                    \
+            nrf_wdt_reload_request_set(inst,                 \
+                (nrf_wdt_rr_register_t)(NRF_WDT_RR0 + i));   \
+        }                                                    \
+    } while (0)
+#if defined(NRF_WDT0) && defined(NRF_WDT1)
+    FEED_NRFX_WDT_INST(NRF_WDT0);
+    FEED_NRFX_WDT_INST(NRF_WDT1);
+#elif defined(NRF_WDT0)
+    FEED_NRFX_WDT_INST(NRF_WDT0);
+#elif defined(NRF_WDT30) && defined(NRF_WDT31)
+    FEED_NRFX_WDT_INST(NRF_WDT30);
+    FEED_NRFX_WDT_INST(NRF_WDT31);
+#elif defined(NRF_WDT30)
+    FEED_NRFX_WDT_INST(NRF_WDT30);
+#elif defined(NRF_WDT31)
+    FEED_NRFX_WDT_INST(NRF_WDT31);
+#elif defined(NRF_WDT010)
+    FEED_NRFX_WDT_INST(NRF_WDT010);
+#else
+#error "No NRFX WDT instances enabled"
+#endif
+#elif defined(CONFIG_WATCHDOG) && DT_NODE_HAS_STATUS(DT_ALIAS(watchdog0), okay)
+    const struct device *watchdog_device = DEVICE_DT_GET(DT_ALIAS(watchdog0));
+
+    if (device_is_ready(watchdog_device)) {
+        wdt_feed(watchdog_device, 0);
+    }
+#endif
+}