boot: zephyr: remove stm32 watchdog defines (1558e7ab) · Commits · Wenxi XU / Mcuboot

The stm32 defines is somewhat redundant due to the generic watchdog defines which uses the watchdog0 alias. Therefore they are removed in this commit. Signed-off-by:

Jeppe Odgaard <jeppe.odgaard@prevas.dk>

boot/zephyr/include/mcuboot_config/mcuboot_config.h

+1 −14

Original line number	Diff line number	Diff line
		@@ -291,20 +291,7 @@
		#error "No NRFX WDT instances enabled"
		#endif /* defined(CONFIG_NRFX_WDT0) && defined(CONFIG_NRFX_WDT1) */

		#elif CONFIG_IWDG_STM32 /* CONFIG_NRFX_WDT */
		#include <zephyr/device.h>
		#include <zephyr/drivers/watchdog.h>

		#define MCUBOOT_WATCHDOG_FEED() \
		do { \
		const struct device* wdt = \
		DEVICE_DT_GET_OR_NULL(DT_INST(0, st_stm32_watchdog)); \
		if (device_is_ready(wdt)) { \
		wdt_feed(wdt, 0); \
		} \
		} while (0)

		#elif DT_NODE_HAS_STATUS(DT_ALIAS(watchdog0), okay) /* CONFIG_IWDG_STM32 */
		#elif DT_NODE_HAS_STATUS(DT_ALIAS(watchdog0), okay) /* CONFIG_NRFX_WDT */
		#include <zephyr/device.h>
		#include <zephyr/drivers/watchdog.h>

Admin message