From 1c62196ea86e54c44cd8425255d98a6cf03e727e Mon Sep 17 00:00:00 2001 From: Tomasz Chyrowicz Date: Thu, 25 Sep 2025 13:42:31 +0200 Subject: [PATCH] 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 --- .../configuration/nrf54h20dk_nrf54h20_cpuapp/app_common.dtsi | 2 ++ .../nrf54h20dk_nrf54h20_cpurad/images/ipc_radio/app.overlay | 2 ++ subsys/mcuboot/mcuboot_secondary_app.overlay | 2 +- west.yml | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/app_common.dtsi b/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/app_common.dtsi index 0807df22d33..20df4aa3b0c 100644 --- a/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/app_common.dtsi +++ b/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/app_common.dtsi @@ -77,6 +77,8 @@ slot1_partition: &cpuapp_slot1_partition { label = "image-1"; }; +secondary_app_partition: &cpuapp_slot1_partition {}; + /* Remove the undefined property value from the disabled VPR cores to prevent build errors. */ &cpuflpr_vpr { /delete-property/ source-memory; diff --git a/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpurad/images/ipc_radio/app.overlay b/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpurad/images/ipc_radio/app.overlay index f4bd46fa995..640b10a81d8 100644 --- a/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpurad/images/ipc_radio/app.overlay +++ b/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpurad/images/ipc_radio/app.overlay @@ -13,3 +13,5 @@ slot0_partition: &cpurad_slot0_partition { slot1_partition: &cpurad_slot1_partition { label = "image-1"; }; + +secondary_app_partition: &cpurad_slot1_partition {}; diff --git a/subsys/mcuboot/mcuboot_secondary_app.overlay b/subsys/mcuboot/mcuboot_secondary_app.overlay index da111a2517b..349f3cd2a69 100644 --- a/subsys/mcuboot/mcuboot_secondary_app.overlay +++ b/subsys/mcuboot/mcuboot_secondary_app.overlay @@ -6,6 +6,6 @@ / { chosen { - zephyr,code-partition = &slot1_partition; + zephyr,code-partition = &secondary_app_partition; }; }; diff --git a/west.yml b/west.yml index 43de2af8875..60d33a6f339 100644 --- a/west.yml +++ b/west.yml @@ -65,7 +65,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: 047df0c5a1ba5a20a2f72ed8bf81dfdb99fcaaa2 + revision: 40af3c982b9a743cea2feabe07d3db66337fb68e import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above