Skip to content

zephyr: mcuboot_config: align nrfx_wdt usage #2507

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

zephyr: mcuboot_config: align nrfx_wdt usage #2507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b1a778
zephyr: remove NRFX_WDT instance symbols
mstasiaknordic Oct 21, 2025
3a32ca0
zephyr: mcuboot_config: align nrfx_wdt usage
mstasiaknordic Oct 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions boot/zephyr/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1088,11 +1088,6 @@ config BOOT_WATCHDOG_FEED_NRFX_WDT
depends on SOC_FAMILY_NORDIC_NRF
# for nRF nrfx based implementation is available
imply NRFX_WDT
imply NRFX_WDT0
imply NRFX_WDT1
imply NRFX_WDT30
imply NRFX_WDT31
imply NRFX_WDT010

config BOOT_IMAGE_ACCESS_HOOKS
bool "Enable hooks for overriding MCUboot's native routines"
Expand Down
41 changes: 20 additions & 21 deletions boot/zephyr/include/mcuboot_config/mcuboot_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,39 +442,38 @@
#if CONFIG_BOOT_WATCHDOG_FEED_NRFX_WDT
#include <nrfx_wdt.h>

#define FEED_WDT_INST(id) \
#define FEED_WDT_INST(inst) \
do { \
nrfx_wdt_t wdt_inst_##id = NRFX_WDT_INSTANCE(id); \
for (uint8_t i = 0; i < NRF_WDT_CHANNEL_NUMBER; i++) \
{ \
nrf_wdt_reload_request_set(wdt_inst_##id.p_reg, \
nrf_wdt_reload_request_set(inst, \
(nrf_wdt_rr_register_t)(NRF_WDT_RR0 + i)); \
} \
} while (0)
#if defined(CONFIG_NRFX_WDT0) && defined(CONFIG_NRFX_WDT1)
#define MCUBOOT_WATCHDOG_FEED() \
do { \
FEED_WDT_INST(0); \
FEED_WDT_INST(1); \
#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(CONFIG_NRFX_WDT0)
#define MCUBOOT_WATCHDOG_FEED() \
FEED_WDT_INST(0);
#elif defined(CONFIG_NRFX_WDT30) && defined(CONFIG_NRFX_WDT31)
#elif defined(NRF_WDT0)
#define MCUBOOT_WATCHDOG_FEED() \
do { \
FEED_WDT_INST(30); \
FEED_WDT_INST(31); \
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(CONFIG_NRFX_WDT30)
#elif defined(NRF_WDT30)
#define MCUBOOT_WATCHDOG_FEED() \
FEED_WDT_INST(30);
#elif defined(CONFIG_NRFX_WDT31)
FEED_WDT_INST(NRF_WDT30);
#elif defined(NRF_WDT31)
#define MCUBOOT_WATCHDOG_FEED() \
FEED_WDT_INST(31);
#elif defined(CONFIG_NRFX_WDT010)
FEED_WDT_INST(NRF_WDT31);
#elif defined(NRF_WDT010)
#define MCUBOOT_WATCHDOG_FEED() \
FEED_WDT_INST(010);
FEED_WDT_INST(NRF_WDT010);
#else
#error "No NRFX WDT instances enabled"
#endif
Expand Down
Loading