Skip to content

Commit a390985

Browse files
committed
subsys: mcuboot: Use secondary_app_partition
Use secondary_app_partition as code partition in Direct XIP without partition manager. This allows to define slot0/1 partitions independently from the application's code partition. Ref: NCSDK-35612 Signed-off-by: Tomasz Chyrowicz <[email protected]>
1 parent f38c07b commit a390985

File tree

4 files changed

+6
-2
lines changed

4 files changed

+6
-2
lines changed

applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/app_common.dtsi

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ slot1_partition: &cpuapp_slot1_partition {
7777
label = "image-1";
7878
};
7979

80+
secondary_app_partition: &cpuapp_slot1_partition {};
81+
8082
/* Remove the undefined property value from the disabled VPR cores to prevent build errors. */
8183
&cpuflpr_vpr {
8284
/delete-property/ source-memory;

applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpurad/images/ipc_radio/app.overlay

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,5 @@ slot0_partition: &cpurad_slot0_partition {
1313
slot1_partition: &cpurad_slot1_partition {
1414
label = "image-1";
1515
};
16+
17+
secondary_app_partition: &cpurad_slot1_partition {};

subsys/mcuboot/mcuboot_secondary_app.overlay

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66

77
/ {
88
chosen {
9-
zephyr,code-partition = &slot1_partition;
9+
zephyr,code-partition = &secondary_app_partition;
1010
};
1111
};

west.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ manifest:
6565
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
6666
- name: zephyr
6767
repo-path: sdk-zephyr
68-
revision: 36d18bbab2375b7e5c95ba49a303f3214b8e1030
68+
revision: pull/3309/head
6969
import:
7070
# In addition to the zephyr repository itself, NCS also
7171
# imports the contents of zephyr/west.yml at the above

0 commit comments

Comments
 (0)