Skip to content

boot: Allow watchdog timeout to be configured #2131

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

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

boot: Allow watchdog timeout to be configured #2131

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
442f5a4
boot: Allow watchdog timeout to be configured
KarlKTorp Nov 26, 2024
d48f124
Install timeout during setup of watchdog
KarlKTorp Nov 26, 2024
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
8 changes: 8 additions & 0 deletions boot/zephyr/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -750,6 +750,14 @@ config BOOT_WATCHDOG_FEED_NRFX_WDT
imply NRFX_WDT30
imply NRFX_WDT31

config MCUBOOT_WATCHDOG_TIMEOUT
int "Watchdog timeout in milliseconds"
default 0
depends on BOOT_WATCHDOG_FEED
help
Specify the watchdog timeout for devices that require a timeout
installed to setup the watchdog.

config BOOT_IMAGE_ACCESS_HOOKS
bool "Enable hooks for overriding MCUboot's native routines"
help
Expand Down
17 changes: 17 additions & 0 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 @@ -371,6 +371,22 @@
#include <zephyr/device.h>
#include <zephyr/drivers/watchdog.h>

#if CONFIG_MCUBOOT_WATCHDOG_TIMEOUT
#define MCUBOOT_WATCHDOG_INSTALL_TIMEOUT() \
do { \
struct wdt_timeout_cfg wdtConfig = { \
.flags = WDT_FLAG_RESET_SOC, \
.window.min = 0, \
.window.max = CONFIG_MCUBOOT_WATCHDOG_TIMEOUT \
}; \
wdt_install_timeout(wdt, &wdtConfig); \
} while (0)
#else
#define MCUBOOT_WATCHDOG_INSTALL_TIMEOUT() \
do { \
} while (0)
#endif /* CONFIG_MCUBOOT_WATCHDOG_TIMEOUT */

#define MCUBOOT_WATCHDOG_SETUP() \
do { \
const struct device* wdt = \
Expand All @@ -385,6 +401,7 @@
const struct device* wdt = \
DEVICE_DT_GET(DT_ALIAS(watchdog0)); \
if (device_is_ready(wdt)) { \
MCUBOOT_WATCHDOG_INSTALL_TIMEOUT(); \
wdt_feed(wdt, 0); \
} \
} while (0)
Expand Down
Loading