diff --git a/boot/zephyr/Kconfig b/boot/zephyr/Kconfig index 2dd084714..3745011a0 100644 --- a/boot/zephyr/Kconfig +++ b/boot/zephyr/Kconfig @@ -736,15 +736,17 @@ config BOOT_WATCHDOG_FEED bool "Feed the watchdog while doing swap" default y if WATCHDOG default y if SOC_FAMILY_NORDIC_NRF + imply BOOT_WATCHDOG_FEED_NRFX_WDT if SOC_FAMILY_NORDIC_NRF + +config BOOT_WATCHDOG_FEED_NRFX_WDT + bool "Feed the watchdog using NRFX WDT directly" + depends on SOC_FAMILY_NORDIC_NRF # for nRF nrfx based implementation is available - imply NRFX_WDT if SOC_FAMILY_NORDIC_NRF - imply NRFX_WDT0 if SOC_FAMILY_NORDIC_NRF - imply NRFX_WDT1 if SOC_FAMILY_NORDIC_NRF - imply NRFX_WDT30 if SOC_FAMILY_NORDIC_NRF - imply NRFX_WDT31 if SOC_FAMILY_NORDIC_NRF - help - Enables implementation of MCUBOOT_WATCHDOG_FEED() macro which is - used to feed watchdog while doing time consuming operations. + imply NRFX_WDT + imply NRFX_WDT0 + imply NRFX_WDT1 + imply NRFX_WDT30 + imply NRFX_WDT31 config BOOT_IMAGE_ACCESS_HOOKS bool "Enable hooks for overriding MCUboot's native routines" diff --git a/boot/zephyr/include/mcuboot_config/mcuboot_config.h b/boot/zephyr/include/mcuboot_config/mcuboot_config.h index 56462fb76..8d479ced7 100644 --- a/boot/zephyr/include/mcuboot_config/mcuboot_config.h +++ b/boot/zephyr/include/mcuboot_config/mcuboot_config.h @@ -330,7 +330,7 @@ #endif #if CONFIG_BOOT_WATCHDOG_FEED -#if CONFIG_NRFX_WDT +#if CONFIG_BOOT_WATCHDOG_FEED_NRFX_WDT #include #define FEED_WDT_INST(id) \ @@ -367,7 +367,7 @@ #error "No NRFX WDT instances enabled" #endif -#elif DT_NODE_HAS_STATUS(DT_ALIAS(watchdog0), okay) /* CONFIG_NRFX_WDT */ +#elif DT_NODE_HAS_STATUS(DT_ALIAS(watchdog0), okay) /* CONFIG_BOOT_WATCHDOG_FEED_NRFX_WDT */ #include #include