Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions boards/nordic/nrf54h20dk/Kconfig.defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,10 @@ config FLASH_LOAD_OFFSET
default 0x30000 if !USE_DT_CODE_PARTITION

endif # BOARD_NRF54H20DK_NRF54H20_CPUAPP_IRON

if BOARD_NRF54H20DK_NRF54H20_CPURAD_IRON

config ROM_START_OFFSET
default 0x800 if BOOTLOADER_MCUBOOT

endif # BOARD_NRF54H20DK_NRF54H20_CPURAD_IRON
8 changes: 8 additions & 0 deletions boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_iron.dts
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,11 @@ slot0_partition: &cpuapp_slot0_partition {
slot1_partition: &cpuapp_slot1_partition {
label = "image-1";
};

slot2_partition: &cpurad_slot0_partition {
label = "image-2";
};

slot3_partition: &cpurad_slot1_partition {
label = "image-3";
};
8 changes: 8 additions & 0 deletions boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_iron.dts
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,11 @@
mbox-names = "tx", "rx";
status = "okay";
};

slot0_partition: &cpurad_slot0_partition {
label = "image-0";
};

slot1_partition: &cpurad_slot1_partition {
label = "image-1";
};
1 change: 1 addition & 0 deletions modules/Kconfig.mcuboot
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ config MCUBOOT_BOOTLOADER_MODE_DIRECT_XIP

config MCUBOOT_BOOTLOADER_MODE_DIRECT_XIP_WITH_REVERT
bool "MCUboot has been configured for DirectXIP with revert"
select MCUBOOT_BOOTUTIL_LIB
select MCUBOOT_BOOTUTIL_LIB_FOR_DIRECT_XIP
select MCUBOOT_BOOTLOADER_MODE_HAS_NO_DOWNGRADE
select MCUBOOT_BOOTLOADER_NO_DOWNGRADE
Expand Down
3 changes: 2 additions & 1 deletion soc/nordic/nrf54h/soc.c
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,8 @@ void soc_late_init_hook(void)

void *radiocore_address =
(void *)(DT_REG_ADDR(DT_GPARENT(DT_NODELABEL_CPURAD_SLOT0_PARTITION)) +
DT_REG_ADDR(DT_NODELABEL_CPURAD_SLOT0_PARTITION));
DT_REG_ADDR(DT_NODELABEL_CPURAD_SLOT0_PARTITION) +
CONFIG_ROM_START_OFFSET);

/* Don't wait as this is not yet supported. */
bool cpu_wait = false;
Expand Down
Loading