Skip to content

Commit 091af82

Browse files
nordic-mik7nordicjm
authored andcommitted
boot/zephyr: nrf54h20dk adaptations
Added basic adaptations needed for introducing nrf54h20dk board support in the future. Signed-off-by: Michal Kozikowski <[email protected]>
1 parent ed434f3 commit 091af82

File tree

4 files changed

+13
-1
lines changed

4 files changed

+13
-1
lines changed

boot/zephyr/Kconfig

+1
Original file line numberDiff line numberDiff line change
@@ -924,6 +924,7 @@ config BOOT_WATCHDOG_FEED_NRFX_WDT
924924
imply NRFX_WDT1
925925
imply NRFX_WDT30
926926
imply NRFX_WDT31
927+
imply NRFX_WDT010
927928

928929
config BOOT_IMAGE_ACCESS_HOOKS
929930
bool "Enable hooks for overriding MCUboot's native routines"

boot/zephyr/flash_map_extended.c

+6
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,12 @@ BOOT_LOG_MODULE_DECLARE(mcuboot);
3636
#define FLASH_DEVICE_BASE 0
3737
#define FLASH_DEVICE_NODE DT_CHOSEN(zephyr_flash_controller)
3838

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+
3945
#else
4046
#error "FLASH_DEVICE_ID could not be determined"
4147
#endif

boot/zephyr/include/mcuboot_config/mcuboot_config.h

+3
Original file line numberDiff line numberDiff line change
@@ -422,6 +422,9 @@
422422
#elif defined(CONFIG_NRFX_WDT31)
423423
#define MCUBOOT_WATCHDOG_FEED() \
424424
FEED_WDT_INST(31);
425+
#elif defined(CONFIG_NRFX_WDT010)
426+
#define MCUBOOT_WATCHDOG_FEED() \
427+
FEED_WDT_INST(010);
425428
#else
426429
#error "No NRFX WDT instances enabled"
427430
#endif

boot/zephyr/include/target.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,11 @@
3030
/*
3131
* Sanity check the target support.
3232
*/
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)) || \
3435
(defined(CONFIG_XTENSA) && !DT_NODE_EXISTS(DT_INST(0, jedec_spi_nor)) && \
3536
!defined(CONFIG_SOC_FAMILY_ESPRESSIF_ESP32)) || \
37+
(defined(CONFIG_SOC_SERIES_NRF54HX) && !DT_HAS_CHOSEN(zephyr_flash)) || \
3638
!defined(FLASH_ALIGN) || \
3739
!(FIXED_PARTITION_EXISTS(slot0_partition)) || \
3840
!(FIXED_PARTITION_EXISTS(slot1_partition) || CONFIG_SINGLE_APPLICATION_SLOT) || \

0 commit comments

Comments
 (0)