Skip to content

Commit 35474b0

Browse files
nordic-mik7nordicjm
authored andcommitted
[nrf fromlist] boot/zephyr: nrf54h20dk adaptations
Added basic adaptations needed for introducing nrf54h20dk board support in the future. Upstream PR #: 2248 Signed-off-by: Michal Kozikowski <[email protected]> (cherry picked from commit 478f4f87c1dac5f775c1be8dca5af6a2a971cb2e)
1 parent 72bcf38 commit 35474b0

File tree

4 files changed

+13
-1
lines changed

4 files changed

+13
-1
lines changed

boot/zephyr/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -987,6 +987,7 @@ config BOOT_WATCHDOG_FEED_NRFX_WDT
987987
imply NRFX_WDT1
988988
imply NRFX_WDT30
989989
imply NRFX_WDT31
990+
imply NRFX_WDT010
990991

991992
config BOOT_IMAGE_ACCESS_HOOKS
992993
bool "Enable hooks for overriding MCUboot's native routines"

boot/zephyr/flash_map_extended.c

Lines changed: 6 additions & 0 deletions
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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -398,6 +398,9 @@
398398
#elif defined(CONFIG_NRFX_WDT31)
399399
#define MCUBOOT_WATCHDOG_FEED() \
400400
FEED_WDT_INST(31);
401+
#elif defined(CONFIG_NRFX_WDT010)
402+
#define MCUBOOT_WATCHDOG_FEED() \
403+
FEED_WDT_INST(010);
401404
#else
402405
#error "No NRFX WDT instances enabled"
403406
#endif

boot/zephyr/include/target.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,11 @@
3232
/*
3333
* Sanity check the target support.
3434
*/
35-
#if (!defined(CONFIG_XTENSA) && !DT_HAS_CHOSEN(zephyr_flash_controller)) || \
35+
#if (!defined(CONFIG_XTENSA) && !defined(CONFIG_SOC_SERIES_NRF54HX) && \
36+
!DT_HAS_CHOSEN(zephyr_flash_controller)) || \
3637
(defined(CONFIG_XTENSA) && !DT_NODE_EXISTS(DT_INST(0, jedec_spi_nor)) && \
3738
!defined(CONFIG_SOC_FAMILY_ESPRESSIF_ESP32)) || \
39+
(defined(CONFIG_SOC_SERIES_NRF54HX) && !DT_HAS_CHOSEN(zephyr_flash)) || \
3840
!defined(FLASH_ALIGN) || \
3941
!(FIXED_PARTITION_EXISTS(slot0_partition)) || \
4042
!(FIXED_PARTITION_EXISTS(slot1_partition) || CONFIG_SINGLE_APPLICATION_SLOT) || \

0 commit comments

Comments
 (0)