File tree 4 files changed +13
-1
lines changed
4 files changed +13
-1
lines changed Original file line number Diff line number Diff line change @@ -924,6 +924,7 @@ config BOOT_WATCHDOG_FEED_NRFX_WDT
924
924
imply NRFX_WDT1
925
925
imply NRFX_WDT30
926
926
imply NRFX_WDT31
927
+ imply NRFX_WDT010
927
928
928
929
config BOOT_IMAGE_ACCESS_HOOKS
929
930
bool "Enable hooks for overriding MCUboot's native routines"
Original file line number Diff line number Diff line change @@ -36,6 +36,12 @@ BOOT_LOG_MODULE_DECLARE(mcuboot);
36
36
#define FLASH_DEVICE_BASE 0
37
37
#define FLASH_DEVICE_NODE DT_CHOSEN(zephyr_flash_controller)
38
38
39
+ #elif (defined(CONFIG_SOC_SERIES_NRF54HX ) && DT_HAS_CHOSEN (zephyr_flash ))
40
+
41
+ #define FLASH_DEVICE_ID SPI_FLASH_0_ID
42
+ #define FLASH_DEVICE_BASE CONFIG_FLASH_BASE_ADDRESS
43
+ #define FLASH_DEVICE_NODE DT_CHOSEN(zephyr_flash)
44
+
39
45
#else
40
46
#error "FLASH_DEVICE_ID could not be determined"
41
47
#endif
Original file line number Diff line number Diff line change 422
422
#elif defined(CONFIG_NRFX_WDT31 )
423
423
#define MCUBOOT_WATCHDOG_FEED () \
424
424
FEED_WDT_INST(31);
425
+ #elif defined(CONFIG_NRFX_WDT010 )
426
+ #define MCUBOOT_WATCHDOG_FEED () \
427
+ FEED_WDT_INST(010);
425
428
#else
426
429
#error "No NRFX WDT instances enabled"
427
430
#endif
Original file line number Diff line number Diff line change 30
30
/*
31
31
* Sanity check the target support.
32
32
*/
33
- #if (!defined(CONFIG_XTENSA ) && !DT_HAS_CHOSEN (zephyr_flash_controller )) || \
33
+ #if (!defined(CONFIG_XTENSA ) && !defined(CONFIG_SOC_SERIES_NRF54HX ) && \
34
+ !DT_HAS_CHOSEN (zephyr_flash_controller )) || \
34
35
(defined(CONFIG_XTENSA ) && !DT_NODE_EXISTS (DT_INST (0 , jedec_spi_nor )) && \
35
36
!defined(CONFIG_SOC_FAMILY_ESPRESSIF_ESP32 )) || \
37
+ (defined(CONFIG_SOC_SERIES_NRF54HX ) && !DT_HAS_CHOSEN (zephyr_flash )) || \
36
38
!defined(FLASH_ALIGN ) || \
37
39
!(FIXED_PARTITION_EXISTS (slot0_partition )) || \
38
40
!(FIXED_PARTITION_EXISTS (slot1_partition ) || CONFIG_SINGLE_APPLICATION_SLOT ) || \
You can’t perform that action at this time.
0 commit comments