From a0ea2ce5ecd90b5cec8472535f5fec59132970cd Mon Sep 17 00:00:00 2001 From: Arkadiusz Balys Date: Thu, 16 Apr 2026 15:09:45 +0200 Subject: [PATCH 1/3] dts: Define common dtsi partition map for Matter Defined partition map for all targets supported in Matter samples. Signed-off-by: Arkadiusz Balys --- dts/samples/matter/nrf52840_partitions.dtsi | 51 ++++++++ .../matter/nrf5340_cpuapp_partitions.dtsi | 58 +++++++++ .../matter/nrf5340_cpunet_partitions.dtsi | 29 +++++ .../matter/nrf54l10_cpuapp_partitions.dtsi | 55 ++++++++ .../nrf54l15_cpuapp_internal_partitions.dtsi | 47 +++++++ .../matter/nrf54l15_cpuapp_ns_partitions.dtsi | 117 ++++++++++++++++++ .../matter/nrf54l15_cpuapp_partitions.dtsi | 56 +++++++++ .../nrf54lm20_cpuapp_internal_partitions.dtsi | 51 ++++++++ .../matter/nrf54lm20_cpuapp_partitions.dtsi | 56 +++++++++ .../matter/nrf7002_cpuapp_partitions.dtsi | 69 +++++++++++ west.yml | 2 +- 11 files changed, 590 insertions(+), 1 deletion(-) create mode 100644 dts/samples/matter/nrf52840_partitions.dtsi create mode 100644 dts/samples/matter/nrf5340_cpuapp_partitions.dtsi create mode 100644 dts/samples/matter/nrf5340_cpunet_partitions.dtsi create mode 100644 dts/samples/matter/nrf54l10_cpuapp_partitions.dtsi create mode 100644 dts/samples/matter/nrf54l15_cpuapp_internal_partitions.dtsi create mode 100644 dts/samples/matter/nrf54l15_cpuapp_ns_partitions.dtsi create mode 100644 dts/samples/matter/nrf54l15_cpuapp_partitions.dtsi create mode 100644 dts/samples/matter/nrf54lm20_cpuapp_internal_partitions.dtsi create mode 100644 dts/samples/matter/nrf54lm20_cpuapp_partitions.dtsi create mode 100644 dts/samples/matter/nrf7002_cpuapp_partitions.dtsi diff --git a/dts/samples/matter/nrf52840_partitions.dtsi b/dts/samples/matter/nrf52840_partitions.dtsi new file mode 100644 index 000000000000..6dc456b52aae --- /dev/null +++ b/dts/samples/matter/nrf52840_partitions.dtsi @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2026 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +/delete-node/ &boot_partition; +/delete-node/ &slot0_partition; +/delete-node/ &slot1_partition; +/delete-node/ &storage_partition; + +&flash0 { + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + boot_partition: partition@0 { + label = "mcuboot"; + reg = <0x00000000 DT_SIZE_K(28)>; + }; + + slot0_partition: partition@7000 { + label = "image-0"; + reg = <0x00007000 DT_SIZE_K(960)>; + }; + + factory_data_partition: partition@f7000 { + label = "factory-data"; + reg = <0x000f7000 DT_SIZE_K(4)>; + }; + + storage_partition: partition@f8000 { + label = "storage"; + reg = <0x000f8000 DT_SIZE_K(40)>; + }; + }; +}; + +&mx25r64 { + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + slot1_partition: partition@0 { + label = "image-1"; + reg = <0x00000000 DT_SIZE_K(960)>; + }; + }; +}; diff --git a/dts/samples/matter/nrf5340_cpuapp_partitions.dtsi b/dts/samples/matter/nrf5340_cpuapp_partitions.dtsi new file mode 100644 index 000000000000..f00cbabbbfe5 --- /dev/null +++ b/dts/samples/matter/nrf5340_cpuapp_partitions.dtsi @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2026 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +/delete-node/ &boot_partition; +/delete-node/ &slot0_partition; +/delete-node/ &slot1_partition; +/delete-node/ &storage_partition; + +&flash0 { + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + boot_partition: partition@0 { + label = "mcuboot"; + reg = <0x00000000 DT_SIZE_K(32)>; + }; + + slot0_partition: partition@8000 { + label = "image-0"; + reg = <0x00008000 DT_SIZE_K(956)>; + }; + + factory_data_partition: partition@f7000 { + label = "factory-data"; + reg = <0x000f7000 DT_SIZE_K(4)>; + }; + + storage_partition: partition@f8000 { + label = "storage"; + reg = <0x000f8000 DT_SIZE_K(32)>; + }; + }; +}; + +&mx25r64 { + status = "okay"; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + slot1_partition: partition@0 { + label = "image-1"; + reg = <0x00000000 DT_SIZE_K(956)>; + }; + + slot3_partition: partition@ef000 { + label = "image-3"; + reg = <0x000ef000 DT_SIZE_K(224)>; + }; + }; +}; diff --git a/dts/samples/matter/nrf5340_cpunet_partitions.dtsi b/dts/samples/matter/nrf5340_cpunet_partitions.dtsi new file mode 100644 index 000000000000..01484479b428 --- /dev/null +++ b/dts/samples/matter/nrf5340_cpunet_partitions.dtsi @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2026 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +/delete-node/ &boot_partition; +/delete-node/ &slot0_partition; +/delete-node/ &slot1_partition; +/delete-node/ &storage_partition; + +&flash1 { + partitions { + b0n_partition: partition@0 { + label = "b0n"; + reg = <0x0 0x8580>; + }; + + bl_storage: provision_partition: partition@8580 { + label = "b0-provision-data"; + reg = <0x8580 0x280>; + }; + + s0_partition: partition@8800 { + label = "image-0"; + reg = <0x8800 DT_SIZE_K(222)>; + }; + }; +}; diff --git a/dts/samples/matter/nrf54l10_cpuapp_partitions.dtsi b/dts/samples/matter/nrf54l10_cpuapp_partitions.dtsi new file mode 100644 index 000000000000..2be3421c03bf --- /dev/null +++ b/dts/samples/matter/nrf54l10_cpuapp_partitions.dtsi @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2026 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +/* restore full SRAM space - by default some parts are dedicated to FLRP */ +&cpuapp_sram { + reg = <0x20000000 DT_SIZE_K(192)>; + ranges = <0x0 0x20000000 DT_SIZE_K(192)>; +}; + +/delete-node/ &boot_partition; +/delete-node/ &slot0_partition; +/delete-node/ &slot1_partition; +/delete-node/ &storage_partition; + +&cpuapp_rram { + partitions { + boot_partition: partition@0 { + label = "mcuboot"; + reg = <0x00000000 DT_SIZE_K(52)>; + }; + + slot0_partition: partition@d000 { + label = "image-0"; + reg = <0x0000d000 DT_SIZE_K(916)>; + }; + + factory_data_partition: partition@f2000 { + label = "factory-data"; + reg = <0x000f2000 DT_SIZE_K(4)>; + }; + + storage_partition: partition@f3000 { + label = "storage"; + reg = <0x000f3000 DT_SIZE_K(40)>; + }; + }; +}; + +&mx25r64 { + status = "okay"; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + slot1_partition: partition@0 { + label = "image-1"; + reg = <0x00000000 DT_SIZE_K(916)>; + }; + }; +}; diff --git a/dts/samples/matter/nrf54l15_cpuapp_internal_partitions.dtsi b/dts/samples/matter/nrf54l15_cpuapp_internal_partitions.dtsi new file mode 100644 index 000000000000..0460dd0449da --- /dev/null +++ b/dts/samples/matter/nrf54l15_cpuapp_internal_partitions.dtsi @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2026 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +/delete-node/ &boot_partition; +/delete-node/ &slot0_partition; +/delete-node/ &slot1_partition; +/delete-node/ &storage_partition; + +&cpuapp_sram { + reg = <0x20000000 DT_SIZE_K(256)>; + ranges = <0x0 0x20000000 DT_SIZE_K(256)>; +}; + +&cpuapp_rram { + reg = <0x0 DT_SIZE_K(1524)>; + + partitions { + boot_partition: partition@0 { + label = "mcuboot"; + reg = <0x00000000 DT_SIZE_K(52)>; + }; + + slot0_partition: partition@d000 { + label = "image-0"; + reg = <0x0000d000 DT_SIZE_K(864)>; + }; + + /* Compression ratio 34.75% */ + slot1_partition: partition@e5000 { + label = "image-1"; + reg = <0x00e5000 DT_SIZE_K(564)>; + }; + + factory_data_partition: partition@172000 { + label = "factory-data"; + reg = <0x00172000 DT_SIZE_K(4)>; + }; + + storage_partition: partition@173000 { + label = "storage"; + reg = <0x00173000 DT_SIZE_K(40)>; + }; + }; +}; diff --git a/dts/samples/matter/nrf54l15_cpuapp_ns_partitions.dtsi b/dts/samples/matter/nrf54l15_cpuapp_ns_partitions.dtsi new file mode 100644 index 000000000000..e35cf7a2f05c --- /dev/null +++ b/dts/samples/matter/nrf54l15_cpuapp_ns_partitions.dtsi @@ -0,0 +1,117 @@ +/* + * Copyright (c) 2026 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +/delete-node/ &sram0_s; +/delete-node/ &sram0_ns; + +&cpuapp_sram { + reg = <0x20000000 DT_SIZE_K(256)>; + ranges = <0x0 0x20000000 DT_SIZE_K(256)>; + + sram0_s: image_s@0 { + #address-cells = <0x1>; + #size-cells = <0x1>; + reg = <0x0 DT_SIZE_K(60)>; + ranges = <0x0 0x0 DT_SIZE_K(60)>; + }; + + sram0_ns: image_ns@f000 { + #address-cells = <0x1>; + #size-cells = <0x1>; + reg = <0xf000 DT_SIZE_K(196)>; + ranges = <0x0 0xf000 DT_SIZE_K(196)>; + }; +}; + +/delete-node/ &slot0_partition; +/delete-node/ &storage_partition; +/delete-node/ &slot0_ns_partition; +/delete-node/ &tfm_its_partition; +/delete-node/ &tfm_otp_partition; +/delete-node/ &tfm_ps_partition; + +&cpuapp_rram { + reg = <0x0 DT_SIZE_K(1524)>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + boot_partition: partition@0 { + label = "mcuboot"; + reg = <0x0 DT_SIZE_K(32)>; + }; + + slot0_partition: partition@d000 { + compatible = "fixed-subpartitions"; + label = "image-0"; + reg = <0xd000 DT_SIZE_K(1396)>; + ranges = <0x0 0xd000 DT_SIZE_K(1396)>; + #address-cells = <1>; + #size-cells = <1>; + + slot0_s_partition: partition@0 { + label = "image-0-secure"; + reg = <0x0 DT_SIZE_K(128)>; + }; + + slot0_ns_partition: partition@20000 { + label = "image-0-nonsecure"; + reg = <0x00020000 DT_SIZE_K(1268)>; + }; + }; + + factory_data_partition: partition@16a000 { + label = "factory-data"; + reg = <0x0016a000 DT_SIZE_K(4)>; + }; + + storage_partition: partition@16b000 { + label = "storage"; + reg = <0x0016b000 DT_SIZE_K(40)>; + }; + + tfm_storage_partition: partition@175000 { + compatible = "fixed-subpartitions"; + label = "tfm-storage"; + reg = <0x175000 DT_SIZE_K(32)>; + ranges = <0x0 0x175000 DT_SIZE_K(32)>; + #address-cells = <1>; + #size-cells = <1>; + + tfm_its_partition: partition@0 { + label = "tfm-its"; + reg = <0x0 DT_SIZE_K(8)>; + }; + + tfm_otp_partition: partition@2000 { + label = "tfm-otp"; + reg = <0x2000 DT_SIZE_K(8)>; + }; + + tfm_ps_partition: partition@4000 { + label = "tfm-ps"; + reg = <0x4000 DT_SIZE_K(16)>; + }; + }; + }; +}; + +&mx25r64 { + status = "okay"; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + slot1_partition: partition@0 { + label = "image-1"; + reg = <0x00000000 DT_SIZE_K(1396)>; + }; + }; +}; diff --git a/dts/samples/matter/nrf54l15_cpuapp_partitions.dtsi b/dts/samples/matter/nrf54l15_cpuapp_partitions.dtsi new file mode 100644 index 000000000000..3785939c107b --- /dev/null +++ b/dts/samples/matter/nrf54l15_cpuapp_partitions.dtsi @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2026 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +/delete-node/ &boot_partition; +/delete-node/ &slot0_partition; +/delete-node/ &slot1_partition; +/delete-node/ &storage_partition; + +&cpuapp_sram { + reg = <0x20000000 DT_SIZE_K(256)>; + ranges = <0x0 0x20000000 DT_SIZE_K(256)>; +}; + +&cpuapp_rram { + reg = <0x0 DT_SIZE_K(1524)>; + + partitions { + boot_partition: partition@0 { + label = "mcuboot"; + reg = <0x00000000 DT_SIZE_K(52)>; + }; + + slot0_partition: partition@d000 { + label = "image-0"; + reg = <0x0000d000 DT_SIZE_K(1428)>; + }; + + factory_data_partition: partition@172000 { + label = "factory-data"; + reg = <0x00172000 DT_SIZE_K(4)>; + }; + + storage_partition: partition@173000 { + label = "storage"; + reg = <0x00173000 DT_SIZE_K(40)>; + }; + }; +}; + +&mx25r64 { + status = "okay"; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + slot1_partition: partition@0 { + label = "image-1"; + reg = <0x00000000 DT_SIZE_K(1428)>; + }; + }; +}; diff --git a/dts/samples/matter/nrf54lm20_cpuapp_internal_partitions.dtsi b/dts/samples/matter/nrf54lm20_cpuapp_internal_partitions.dtsi new file mode 100644 index 000000000000..9a822be2ce23 --- /dev/null +++ b/dts/samples/matter/nrf54lm20_cpuapp_internal_partitions.dtsi @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2026 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +/delete-node/ &boot_partition; +/delete-node/ &slot0_partition; +/delete-node/ &slot1_partition; +/delete-node/ &storage_partition; + +&cpuapp_sram { + reg = <0x20000000 DT_SIZE_K(511)>; + ranges = <0x0 0x20000000 DT_SIZE_K(511)>; +}; + +&cpuapp_rram { + reg = <0x0 DT_SIZE_K(2036)>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + boot_partition: partition@0 { + label = "mcuboot"; + reg = <0x00000000 DT_SIZE_K(40)>; + }; + + slot0_partition: partition@a000 { + label = "image-0"; + reg = <0x0000a000 DT_SIZE_K(1176)>; + }; + + /* Compression ratio 34.75% */ + slot1_partition: partition@130000 { + label = "image-1"; + reg = <0x00130000 DT_SIZE_K(768)>; + }; + + factory_data_partition: partition@1f0000 { + label = "factory-data"; + reg = <0x001f0000 DT_SIZE_K(4)>; + }; + + storage_partition: partition@1f1000 { + label = "storage"; + reg = <0x001f1000 DT_SIZE_K(40)>; + }; + }; +}; diff --git a/dts/samples/matter/nrf54lm20_cpuapp_partitions.dtsi b/dts/samples/matter/nrf54lm20_cpuapp_partitions.dtsi new file mode 100644 index 000000000000..0c9544234ee7 --- /dev/null +++ b/dts/samples/matter/nrf54lm20_cpuapp_partitions.dtsi @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2026 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +/delete-node/ &boot_partition; +/delete-node/ &slot0_partition; +/delete-node/ &slot1_partition; +/delete-node/ &storage_partition; + +&cpuapp_sram { + reg = <0x20000000 DT_SIZE_K(511)>; + ranges = <0x0 0x20000000 DT_SIZE_K(511)>; +}; + +&cpuapp_rram { + reg = <0x0 DT_SIZE_K(2036)>; + + partitions { + boot_partition: partition@0 { + label = "mcuboot"; + reg = <0x00000000 DT_SIZE_K(52)>; + }; + + slot0_partition: partition@d000 { + label = "image-0"; + reg = <0x0000d000 DT_SIZE_K(1932)>; + }; + + factory_data_partition: partition@1f0000 { + label = "factory-data"; + reg = <0x001f0000 DT_SIZE_K(4)>; + }; + + storage_partition: partition@1f1000 { + label = "storage"; + reg = <0x001f1000 DT_SIZE_K(40)>; + }; + }; +}; + +&mx25r64 { + status = "okay"; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + slot1_partition: partition@0 { + label = "image-1"; + reg = <0x00000000 DT_SIZE_K(1932)>; + }; + }; +}; diff --git a/dts/samples/matter/nrf7002_cpuapp_partitions.dtsi b/dts/samples/matter/nrf7002_cpuapp_partitions.dtsi new file mode 100644 index 000000000000..326f18ae8531 --- /dev/null +++ b/dts/samples/matter/nrf7002_cpuapp_partitions.dtsi @@ -0,0 +1,69 @@ +/* + * Copyright (c) 2026 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +/delete-node/ &boot_partition; +/delete-node/ &slot0_partition; +/delete-node/ &slot1_partition; +/delete-node/ &storage_partition; + +&flash0 { + partitions { + boot_partition: partition@0 { + label = "mcuboot"; + reg = <0x00000000 DT_SIZE_K(48)>; + }; + + slot0_partition: partition@c000 { + label = "image-0"; + reg = <0x0000c000 DT_SIZE_K(940)>; + }; + + factory_data_partition: partition@f7000 { + label = "factory-data"; + reg = <0x000f7000 DT_SIZE_K(4)>; + }; + + storage_partition: partition@f8000 { + label = "storage"; + reg = <0x000f8000 DT_SIZE_K(32)>; + }; + }; +}; + +&mx25r64 { + status = "okay"; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + slot1_partition: partition@0 { + label = "image-1"; + reg = <0x00000000 DT_SIZE_K(940)>; + }; + + slot3_partition: partition@eb000 { + label = "image-3"; + reg = <0x000eb000 DT_SIZE_K(224)>; + }; + + slot4_partition: partition@12b000 { + label = "image-4"; + reg = <0x0012b000 DT_SIZE_K(132)>; + }; + + nrf70_wifi_fw_partition: nrf70_fw_partition: partition@12b200 { + label = "nrf70-wifi-fw"; + reg = <0x0012b200 DT_SIZE_K(128)>; + }; + + slot5_partition: partition@14c000 { + label = "image-5"; + reg = <0x0014c000 DT_SIZE_K(132)>; + }; + }; +}; diff --git a/west.yml b/west.yml index 6250d1027260..67481a27876f 100644 --- a/west.yml +++ b/west.yml @@ -157,7 +157,7 @@ manifest: - name: matter repo-path: sdk-connectedhomeip path: modules/lib/matter - revision: 06f463dd878a39741edfc08a9f15e04666642b20 + revision: 68fb1e39ed5114a755fe661cd63c15b5a49b995c west-commands: scripts/west/west-commands.yml submodules: - name: nlio From f68984e76b02b7eb2792697b44d9853305f87c96 Mon Sep 17 00:00:00 2001 From: Arkadiusz Balys Date: Thu, 16 Apr 2026 15:09:52 +0200 Subject: [PATCH 2/3] sysbuild: Align Matter to non-PM builds Added matter.cmake to use image flasher for generating factory data. Aligned CMakeLists.txt with changes in Matter SDK. Signed-off-by: Arkadiusz Balys --- sysbuild/CMakeLists.txt | 18 ++++++++++-------- sysbuild/matter.cmake | 16 ++++++++++++++++ 2 files changed, 26 insertions(+), 8 deletions(-) create mode 100644 sysbuild/matter.cmake diff --git a/sysbuild/CMakeLists.txt b/sysbuild/CMakeLists.txt index f1799bfc8f15..274193d4acfa 100644 --- a/sysbuild/CMakeLists.txt +++ b/sysbuild/CMakeLists.txt @@ -987,11 +987,6 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_post_cmake) include(${ZEPHYR_NRF_MODULE_DIR}/cmake/sysbuild/fast_pair/hex.cmake) endif() - if(SB_CONFIG_MATTER_FACTORY_DATA_GENERATE) - include(${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconnect/chip-module/generate_factory_data_sysbuild.cmake) - nrfconnect_generate_factory_data() - endif() - # Sign extra DFU images added via dfu_extra_add_binary() if(SB_CONFIG_MCUBOOT_EXTRA_IMAGES) include(${ZEPHYR_NRF_MODULE_DIR}/cmake/sysbuild/image_signing_extra.cmake) @@ -1012,9 +1007,15 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_post_cmake) include(${ZEPHYR_NRF_MODULE_DIR}/cmake/sysbuild/generate_default_keyfile.cmake) endif() - if(SB_CONFIG_MATTER_OTA) - include(${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/zephyr/ota-image_sysbuild.cmake) - if(SB_CONFIG_DFU_MULTI_IMAGE_PACKAGE_BUILD) + # Matter related configurations + if(SB_CONFIG_ZEPHYR_CONNECTEDHOMEIP_MODULE AND SB_CONFIG_MATTER) + if(SB_CONFIG_MATTER_FACTORY_DATA_GENERATE) + include(${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconnect/chip-module/generate_factory_data.cmake) + nrfconnect_generate_factory_data() + endif() + + if(SB_CONFIG_MATTER_OTA AND SB_CONFIG_DFU_MULTI_IMAGE_PACKAGE_BUILD) + include(${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/zephyr/ota-image_sysbuild.cmake) chip_ota_image(chip-ota-image INPUT_FILES ${CMAKE_BINARY_DIR}/dfu_multi_image.bin OUTPUT_FILE ${CMAKE_BINARY_DIR}/${SB_CONFIG_MATTER_OTA_IMAGE_FILE_NAME} @@ -1172,5 +1173,6 @@ include(${CMAKE_CURRENT_LIST_DIR}/firmware_loader_installer.cmake) include(${CMAKE_CURRENT_LIST_DIR}/nrf70.cmake) include(${CMAKE_CURRENT_LIST_DIR}/dfu_extra_images.cmake) include(${CMAKE_CURRENT_LIST_DIR}/bt_fast_pair.cmake) +include(${CMAKE_CURRENT_LIST_DIR}/matter.cmake) store_ncs_vars() diff --git a/sysbuild/matter.cmake b/sysbuild/matter.cmake new file mode 100644 index 000000000000..dc191d3593a6 --- /dev/null +++ b/sysbuild/matter.cmake @@ -0,0 +1,16 @@ + +# +# Copyright (c) 2026 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +if(SB_CONFIG_ZEPHYR_CONNECTEDHOMEIP_MODULE AND SB_CONFIG_MATTER AND + SB_CONFIG_MATTER_FACTORY_DATA_GENERATE AND NOT SB_CONFIG_PARTITION_MANAGER +) + include(image_flasher.cmake) + add_image_flasher( + NAME matter_factory_data + HEX_FILE "${CMAKE_BINARY_DIR}/matter_factory_data/zephyr/factory_data.hex" + ) +endif() From 8c1a206f7db5f974b3f79a80ee22a4904cfbb2df Mon Sep 17 00:00:00 2001 From: Arkadiusz Balys Date: Thu, 16 Apr 2026 15:09:58 +0200 Subject: [PATCH 3/3] samples: matter: Switch Matter Tempate sample to non-PM build Refactored Matter Temple sample to non-Partition Manager build. Aligned all images and board files. Signed-off-by: Arkadiusz Balys --- samples/matter/template/Kconfig.sysbuild | 60 +++++--- .../boards/nrf52840dk_nrf52840.overlay | 6 + .../boards/nrf5340dk_nrf5340_cpuapp.overlay | 11 +- .../boards/nrf54l15dk_nrf54l10_cpuapp.overlay | 12 +- .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 12 +- ...rf54l15dk_nrf54l15_cpuapp_internal.overlay | 16 +- .../nrf54l15dk_nrf54l15_cpuapp_ns.overlay | 12 +- .../nrf54l15tag_nrf54l15_cpuapp.overlay | 12 +- .../nrf54lm20dk_nrf54lm20a_cpuapp.overlay | 13 +- ...4lm20dk_nrf54lm20a_cpuapp_internal.overlay | 13 +- .../nrf54lm20dk_nrf54lm20b_cpuapp.overlay | 13 +- ...4lm20dk_nrf54lm20b_cpuapp_internal.overlay | 13 +- .../boards/nrf7002dk_nrf5340_cpuapp.overlay | 11 +- .../pm_static_nrf52840dk_nrf52840.yml | 42 ------ .../pm_static_nrf5340dk_nrf5340_cpuapp.yml | 56 ------- ...tatic_nrf5340dk_nrf5340_cpuapp_nrf70ek.yml | 80 ---------- .../pm_static_nrf54l15dk_nrf54l10_cpuapp.yml | 56 ------- .../pm_static_nrf54l15dk_nrf54l15_cpuapp.yml | 56 ------- ...ic_nrf54l15dk_nrf54l15_cpuapp_internal.yml | 52 ------- ...m_static_nrf54l15dk_nrf54l15_cpuapp_ns.yml | 141 ------------------ .../pm_static_nrf54l15tag_nrf54l15_cpuapp.yml | 52 ------- ...m_static_nrf54lm20dk_nrf54lm20a_cpuapp.yml | 56 ------- ...nrf54lm20dk_nrf54lm20a_cpuapp_internal.yml | 52 ------- ...m_static_nrf54lm20dk_nrf54lm20b_cpuapp.yml | 56 ------- ...nrf54lm20dk_nrf54lm20b_cpuapp_internal.yml | 52 ------- .../pm_static_nrf7002dk_nrf5340_cpuapp.yml | 80 ---------- samples/matter/template/sample.yaml | 2 - samples/matter/template/sysbuild.conf | 1 + .../boards/nrf5340dk_nrf5340_cpunet.overlay | 13 ++ .../boards/nrf7002dk_nrf5340_cpunet.overlay | 13 ++ samples/matter/template/sysbuild/b0n/prj.conf | 37 +++++ .../boards/nrf5340dk_nrf5340_cpunet.overlay | 7 + .../boards/nrf7002dk_nrf5340_cpunet.overlay | 7 + .../boards/nrf52840dk_nrf52840.overlay | 6 + .../boards/nrf5340dk_nrf5340_cpuapp.conf | 5 + .../boards/nrf5340dk_nrf5340_cpuapp.overlay | 6 + .../boards/nrf54l15dk_nrf54l10_cpuapp.overlay | 13 +- .../boards/nrf54l15dk_nrf54l15_cpuapp.conf | 3 - .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 13 +- ...rf54l15dk_nrf54l15_cpuapp_internal.overlay | 20 +-- .../boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf | 26 ++++ .../nrf54l15tag_nrf54l15_cpuapp.overlay | 12 +- .../boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf | 3 - .../nrf54lm20dk_nrf54lm20a_cpuapp.overlay | 10 +- ...rf54lm20dk_nrf54lm20a_cpuapp_internal.conf | 3 - ...4lm20dk_nrf54lm20a_cpuapp_internal.overlay | 17 +-- .../boards/nrf54lm20dk_nrf54lm20b_cpuapp.conf | 3 - .../nrf54lm20dk_nrf54lm20b_cpuapp.overlay | 10 +- ...rf54lm20dk_nrf54lm20b_cpuapp_internal.conf | 3 - ...4lm20dk_nrf54lm20b_cpuapp_internal.overlay | 17 +-- .../boards/nrf7002dk_nrf5340_cpuapp.conf | 13 +- .../boards/nrf7002dk_nrf5340_cpuapp.overlay | 6 + .../matter/template/sysbuild/mcuboot/prj.conf | 2 +- .../matter/template/sysbuild_internal.conf | 3 +- 54 files changed, 246 insertions(+), 1063 deletions(-) delete mode 100644 samples/matter/template/pm_static_nrf52840dk_nrf52840.yml delete mode 100644 samples/matter/template/pm_static_nrf5340dk_nrf5340_cpuapp.yml delete mode 100644 samples/matter/template/pm_static_nrf5340dk_nrf5340_cpuapp_nrf70ek.yml delete mode 100644 samples/matter/template/pm_static_nrf54l15dk_nrf54l10_cpuapp.yml delete mode 100644 samples/matter/template/pm_static_nrf54l15dk_nrf54l15_cpuapp.yml delete mode 100644 samples/matter/template/pm_static_nrf54l15dk_nrf54l15_cpuapp_internal.yml delete mode 100644 samples/matter/template/pm_static_nrf54l15dk_nrf54l15_cpuapp_ns.yml delete mode 100644 samples/matter/template/pm_static_nrf54l15tag_nrf54l15_cpuapp.yml delete mode 100644 samples/matter/template/pm_static_nrf54lm20dk_nrf54lm20a_cpuapp.yml delete mode 100644 samples/matter/template/pm_static_nrf54lm20dk_nrf54lm20a_cpuapp_internal.yml delete mode 100644 samples/matter/template/pm_static_nrf54lm20dk_nrf54lm20b_cpuapp.yml delete mode 100644 samples/matter/template/pm_static_nrf54lm20dk_nrf54lm20b_cpuapp_internal.yml delete mode 100644 samples/matter/template/pm_static_nrf7002dk_nrf5340_cpuapp.yml create mode 100644 samples/matter/template/sysbuild/b0n/boards/nrf5340dk_nrf5340_cpunet.overlay create mode 100644 samples/matter/template/sysbuild/b0n/boards/nrf7002dk_nrf5340_cpunet.overlay create mode 100644 samples/matter/template/sysbuild/b0n/prj.conf create mode 100644 samples/matter/template/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.overlay create mode 100644 samples/matter/template/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.overlay create mode 100644 samples/matter/template/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf diff --git a/samples/matter/template/Kconfig.sysbuild b/samples/matter/template/Kconfig.sysbuild index 01319d7f0e23..ead2881621ad 100644 --- a/samples/matter/template/Kconfig.sysbuild +++ b/samples/matter/template/Kconfig.sysbuild @@ -36,9 +36,6 @@ config DFU_MULTI_IMAGE_PACKAGE_BUILD config DFU_MULTI_IMAGE_PACKAGE_APP default y -config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY - default y - #### DFU network core configuration if SOC_SERIES_NRF53 @@ -61,22 +58,6 @@ config DFU_MULTI_IMAGE_PACKAGE_NET endif # SOC_SERIES_NRF53 -if BOARD_NRF54L15DK || BOARD_NRF54LM20DK - -# Disable checking the external drivers for nRF54L15 and nRF54LM20 DKs. -config PM_OVERRIDE_EXTERNAL_DRIVER_CHECK - default y - -endif # BOARD_NRF54L15DK || BOARD_NRF54LM20DK - -# Mcuboot padding size is modified to 0x1000 in pm_static file. -if SOC_NRF54L10 - -config PM_MCUBOOT_PAD - default 0x1000 - -endif # SOC_NRF54L10 - endif # BOOTLOADER_MCUBOOT # Store the Wi-Fi firmware patch on external flash by default for nRF5340 with nRF7002 @@ -99,19 +80,50 @@ config MATTER_FACTORY_DATA_GENERATE # Internal flash only for nRF54L15 tag with compression if BOARD_NRF54L15TAG +choice MCUBOOT_MODE + default MCUBOOT_MODE_OVERWRITE_ONLY +endchoice + +config MCUBOOT_COMPRESSED_IMAGE_SUPPORT + default y + +endif + +# Partition Manager backwards compatibility +if PARTITION_MANAGER + +if SOC_NRF54L10 + +config PM_MCUBOOT_PAD + default 0x1000 + +endif # SOC_NRF54L10 + +if BOARD_NRF54L15TAG + config PM_OVERRIDE_EXTERNAL_DRIVER_CHECK default y config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY default y -choice MCUBOOT_MODE - default MCUBOOT_MODE_OVERWRITE_ONLY -endchoice +endif # BOARD_NRF54L15TAG -config MCUBOOT_COMPRESSED_IMAGE_SUPPORT +if BOARD_NRF54L15DK || BOARD_NRF54LM20DK + +# Disable checking the external drivers for nRF54L15 and nRF54LM20 DKs. +config PM_OVERRIDE_EXTERNAL_DRIVER_CHECK default y -endif +endif # BOARD_NRF54L15DK || BOARD_NRF54LM20DK + +if BOOTLOADER_MCUBOOT + +config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY + default y + +endif # BOOTLOADER_MCUBOOT + +endif # PARTITION_MANAGER source "share/sysbuild/Kconfig" diff --git a/samples/matter/template/boards/nrf52840dk_nrf52840.overlay b/samples/matter/template/boards/nrf52840dk_nrf52840.overlay index cb345a83fcba..ef48894a939a 100644 --- a/samples/matter/template/boards/nrf52840dk_nrf52840.overlay +++ b/samples/matter/template/boards/nrf52840dk_nrf52840.overlay @@ -4,12 +4,18 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ +#include + / { chosen { nordic,pm-ext-flash = &mx25r64; }; }; +&mx25r64 { + status = "okay"; +}; + /* Disable unused peripherals to reduce power consumption */ &adc { status = "disabled"; diff --git a/samples/matter/template/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/matter/template/boards/nrf5340dk_nrf5340_cpuapp.overlay index a6db040464d9..1474b5b88a18 100644 --- a/samples/matter/template/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/samples/matter/template/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -4,17 +4,22 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ +#include #include +/* Set IPC thread priority to the highest value to not collide with other threads. */ +&ipc0 { + zephyr,priority = <0 PRIO_COOP>; +}; + / { chosen { nordic,pm-ext-flash = &mx25r64; }; }; -/* Set IPC thread priority to the highest value to not collide with other threads. */ -&ipc0 { - zephyr,priority = <0 PRIO_COOP>; +&mx25r64 { + status = "okay"; }; /* Disable unused peripherals to reduce power consumption */ diff --git a/samples/matter/template/boards/nrf54l15dk_nrf54l10_cpuapp.overlay b/samples/matter/template/boards/nrf54l15dk_nrf54l10_cpuapp.overlay index efe6e4d9cc45..37086f717537 100644 --- a/samples/matter/template/boards/nrf54l15dk_nrf54l10_cpuapp.overlay +++ b/samples/matter/template/boards/nrf54l15dk_nrf54l10_cpuapp.overlay @@ -4,6 +4,8 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ +#include + / { aliases { /* Use watchdog wdt31 as the application watchdog */ @@ -15,16 +17,6 @@ }; }; -/* restore full RRAM and SRAM space - by default some parts are dedicated to FLRP */ -&cpuapp_rram { - reg = <0x0 DT_SIZE_K(1012)>; -}; - -&cpuapp_sram { - reg = <0x20000000 DT_SIZE_K(192)>; - ranges = <0x0 0x20000000 DT_SIZE_K(192)>; -}; - &mx25r64 { status = "okay"; }; diff --git a/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp.overlay index 8be7316adf87..694b19b5de52 100644 --- a/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp.overlay +++ b/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp.overlay @@ -4,6 +4,8 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ +#include + / { aliases { /* Use watchdog wdt31 as the application watchdog */ @@ -15,16 +17,6 @@ }; }; -/* restore full RRAM and SRAM space - by default some parts are dedicated to FLRP */ -&cpuapp_rram { - reg = <0x0 DT_SIZE_K(1524)>; -}; - -&cpuapp_sram { - reg = <0x20000000 DT_SIZE_K(256)>; - ranges = <0x0 0x20000000 0x40000>; -}; - &mx25r64 { status = "okay"; }; diff --git a/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp_internal.overlay b/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp_internal.overlay index 8c0cb06fa4ea..e3f96ede86cc 100644 --- a/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp_internal.overlay +++ b/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp_internal.overlay @@ -4,6 +4,8 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ +#include + / { aliases { /* Use watchdog wdt31 as the application watchdog */ @@ -11,20 +13,6 @@ }; }; -/* restore full RRAM and SRAM space - by default some parts are dedicated to FLRP */ -&cpuapp_rram { - reg = <0x0 DT_SIZE_K(1524)>; -}; - -&cpuapp_sram { - reg = <0x20000000 DT_SIZE_K(256)>; - ranges = <0x0 0x20000000 0x40000>; -}; - -&mx25r64 { - status = "disabled"; -}; - &wdt31 { status = "okay"; }; diff --git a/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp_ns.overlay b/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp_ns.overlay index b2478dccb0cb..fd05f01b2a3f 100644 --- a/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp_ns.overlay +++ b/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp_ns.overlay @@ -4,6 +4,8 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ +#include + / { aliases { /* Use watchdog wdt31 as the application watchdog */ @@ -15,16 +17,6 @@ }; }; -/* restore full RRAM and SRAM space - by default some parts are dedicated to FLRP */ -&cpuapp_rram { - reg = <0x0 DT_SIZE_K(1524)>; -}; - -&cpuapp_sram { - reg = <0x20000000 DT_SIZE_K(256)>; - ranges = <0x0 0x20000000 0x40000>; -}; - &mx25r64 { status = "okay"; }; diff --git a/samples/matter/template/boards/nrf54l15tag_nrf54l15_cpuapp.overlay b/samples/matter/template/boards/nrf54l15tag_nrf54l15_cpuapp.overlay index 8978b2f1fbfe..19822f9d12a1 100644 --- a/samples/matter/template/boards/nrf54l15tag_nrf54l15_cpuapp.overlay +++ b/samples/matter/template/boards/nrf54l15tag_nrf54l15_cpuapp.overlay @@ -4,6 +4,8 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ +#include + / { aliases { /* Use watchdog wdt31 as the application watchdog */ @@ -11,16 +13,6 @@ }; }; -/* restore full RRAM and SRAM space - by default some parts are dedicated to FLRP */ -&cpuapp_rram { - reg = <0x0 DT_SIZE_K(1524)>; -}; - -&cpuapp_sram { - reg = <0x20000000 DT_SIZE_K(256)>; - ranges = <0x0 0x20000000 0x40000>; -}; - &wdt31 { status = "okay"; }; diff --git a/samples/matter/template/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay b/samples/matter/template/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay index edcffc5fb26c..880354d8056e 100644 --- a/samples/matter/template/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay +++ b/samples/matter/template/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay @@ -4,21 +4,16 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -/ { - chosen { - nordic,pm-ext-flash = &mx25r64; - }; +#include +/ { aliases { /* Use watchdog wdt31 as the application watchdog */ watchdog0 = &wdt31; }; -}; -&rram_controller { - cpuapp_rram: rram@0 { - reg = <0x0 DT_SIZE_K(2036)>; - ranges = <0x0 0x0 DT_SIZE_K(2036)>; + chosen { + nordic,pm-ext-flash = &mx25r64; }; }; diff --git a/samples/matter/template/boards/nrf54lm20dk_nrf54lm20a_cpuapp_internal.overlay b/samples/matter/template/boards/nrf54lm20dk_nrf54lm20a_cpuapp_internal.overlay index 2e8fcd150a85..329518c701a7 100644 --- a/samples/matter/template/boards/nrf54lm20dk_nrf54lm20a_cpuapp_internal.overlay +++ b/samples/matter/template/boards/nrf54lm20dk_nrf54lm20a_cpuapp_internal.overlay @@ -4,6 +4,8 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ +#include + / { aliases { /* Use watchdog wdt31 as the application watchdog */ @@ -11,17 +13,6 @@ }; }; -&rram_controller { - cpuapp_rram: rram@0 { - reg = <0x0 DT_SIZE_K(2036)>; - ranges = <0x0 0x0 DT_SIZE_K(2036)>; - }; -}; - -&mx25r64 { - status = "disabled"; -}; - &wdt31 { status = "okay"; }; diff --git a/samples/matter/template/boards/nrf54lm20dk_nrf54lm20b_cpuapp.overlay b/samples/matter/template/boards/nrf54lm20dk_nrf54lm20b_cpuapp.overlay index 22ef54a62f2d..150b01d6180b 100644 --- a/samples/matter/template/boards/nrf54lm20dk_nrf54lm20b_cpuapp.overlay +++ b/samples/matter/template/boards/nrf54lm20dk_nrf54lm20b_cpuapp.overlay @@ -4,21 +4,16 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -/ { - chosen { - nordic,pm-ext-flash = &mx25r64; - }; +#include +/ { aliases { /* Use watchdog wdt31 as the application watchdog */ watchdog0 = &wdt31; }; -}; -&rram_controller { - cpuapp_rram: rram@0 { - reg = <0x0 DT_SIZE_K(2036)>; - ranges = <0x0 0x0 DT_SIZE_K(2036)>; + chosen { + nordic,pm-ext-flash = &mx25r64; }; }; diff --git a/samples/matter/template/boards/nrf54lm20dk_nrf54lm20b_cpuapp_internal.overlay b/samples/matter/template/boards/nrf54lm20dk_nrf54lm20b_cpuapp_internal.overlay index f45c210fe2ab..ec5ce34565a6 100644 --- a/samples/matter/template/boards/nrf54lm20dk_nrf54lm20b_cpuapp_internal.overlay +++ b/samples/matter/template/boards/nrf54lm20dk_nrf54lm20b_cpuapp_internal.overlay @@ -4,6 +4,8 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ +#include + / { aliases { /* Use watchdog wdt31 as the application watchdog */ @@ -11,17 +13,6 @@ }; }; -&rram_controller { - cpuapp_rram: rram@0 { - reg = <0x0 DT_SIZE_K(2036)>; - ranges = <0x0 0x0 DT_SIZE_K(2036)>; - }; -}; - -&mx25r64 { - status = "disabled"; -}; - &wdt31 { status = "okay"; }; diff --git a/samples/matter/template/boards/nrf7002dk_nrf5340_cpuapp.overlay b/samples/matter/template/boards/nrf7002dk_nrf5340_cpuapp.overlay index 837e117d126a..7daf3b9ff42e 100644 --- a/samples/matter/template/boards/nrf7002dk_nrf5340_cpuapp.overlay +++ b/samples/matter/template/boards/nrf7002dk_nrf5340_cpuapp.overlay @@ -4,16 +4,21 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ +#include #include / { + aliases { + watchdog0 = &wdt0; + }; + chosen { nordic,pm-ext-flash = &mx25r64; }; +}; - aliases { - watchdog0 = &wdt0; - }; +&mx25r64 { + status = "okay"; }; /* Set IPC thread priority to the highest value to not collide with other threads. */ diff --git a/samples/matter/template/pm_static_nrf52840dk_nrf52840.yml b/samples/matter/template/pm_static_nrf52840dk_nrf52840.yml deleted file mode 100644 index 9c4aa3cdcac6..000000000000 --- a/samples/matter/template/pm_static_nrf52840dk_nrf52840.yml +++ /dev/null @@ -1,42 +0,0 @@ -mcuboot: - address: 0x0 - size: 0x7000 - region: flash_primary -mcuboot_pad: - address: 0x7000 - size: 0x200 -app: - address: 0x7200 - size: 0xefe00 -mcuboot_primary: - orig_span: &id001 - - mcuboot_pad - - app - span: *id001 - address: 0x7000 - size: 0xf0000 - region: flash_primary -mcuboot_primary_app: - orig_span: &id002 - - app - span: *id002 - address: 0x7200 - size: 0xefe00 -factory_data: - address: 0xf7000 - size: 0x1000 - region: flash_primary -settings_storage: - address: 0xf8000 - size: 0x8000 - region: flash_primary -mcuboot_secondary: - address: 0x0 - size: 0xf0000 - device: MX25R64 - region: external_flash -external_flash: - address: 0xf0000 - size: 0x710000 - device: MX25R64 - region: external_flash diff --git a/samples/matter/template/pm_static_nrf5340dk_nrf5340_cpuapp.yml b/samples/matter/template/pm_static_nrf5340dk_nrf5340_cpuapp.yml deleted file mode 100644 index 3b0873d5ab3c..000000000000 --- a/samples/matter/template/pm_static_nrf5340dk_nrf5340_cpuapp.yml +++ /dev/null @@ -1,56 +0,0 @@ -mcuboot: - address: 0x0 - size: 0x8000 - region: flash_primary -mcuboot_pad: - address: 0x8000 - size: 0x200 -app: - address: 0x8200 - size: 0xeee00 -mcuboot_primary: - orig_span: &id001 - - mcuboot_pad - - app - span: *id001 - address: 0x8000 - size: 0xef000 - region: flash_primary -mcuboot_primary_app: - orig_span: &id002 - - app - span: *id002 - address: 0x8200 - size: 0xeee00 -factory_data: - address: 0xf7000 - size: 0x1000 - region: flash_primary -settings_storage: - address: 0xf8000 - size: 0x8000 - region: flash_primary -mcuboot_primary_1: - address: 0x0 - size: 0x40000 - device: flash_ctrl - region: ram_flash -mcuboot_secondary: - address: 0x0 - size: 0xef000 - device: MX25R64 - region: external_flash -mcuboot_secondary_1: - address: 0xef000 - size: 0x40000 - device: MX25R64 - region: external_flash -external_flash: - address: 0x12f000 - size: 0x6D1000 - device: MX25R64 - region: external_flash -pcd_sram: - address: 0x20000000 - size: 0x2000 - region: sram_primary diff --git a/samples/matter/template/pm_static_nrf5340dk_nrf5340_cpuapp_nrf70ek.yml b/samples/matter/template/pm_static_nrf5340dk_nrf5340_cpuapp_nrf70ek.yml deleted file mode 100644 index 995593ad0eea..000000000000 --- a/samples/matter/template/pm_static_nrf5340dk_nrf5340_cpuapp_nrf70ek.yml +++ /dev/null @@ -1,80 +0,0 @@ -mcuboot: - address: 0x0 - size: 0x8000 - region: flash_primary -mcuboot_pad: - address: 0x8000 - size: 0x200 -app: - address: 0x8200 - size: 0xeee00 -mcuboot_primary: - orig_span: &id001 - - mcuboot_pad - - app - span: *id001 - address: 0x8000 - size: 0xef000 - region: flash_primary -mcuboot_primary_app: - orig_span: &id002 - - app - span: *id002 - address: 0x8200 - size: 0xeee00 -factory_data: - address: 0xf7000 - size: 0x1000 - region: flash_primary -settings_storage: - address: 0xf8000 - size: 0x8000 - region: flash_primary -mcuboot_primary_1: - address: 0x0 - size: 0x40000 - device: flash_ctrl - region: ram_flash -mcuboot_secondary: - address: 0x0 - size: 0xef000 - device: MX25R64 - region: external_flash -mcuboot_secondary_1: - address: 0xef000 - size: 0x40000 - device: MX25R64 - region: external_flash -nrf70_wifi_fw_mcuboot_pad: - address: 0x12F000 - size: 0x200 - device: MX25R64 - region: external_flash -nrf70_wifi_fw: - address: 0x12F200 - size: 0x20000 - device: MX25R64 - region: external_flash -mcuboot_primary_2: - orig_span: &id003 - - nrf70_wifi_fw_mcuboot_pad - - nrf70_wifi_fw - span: *id003 - address: 0x12F000 - size: 0x21000 - device: MX25R64 - region: external_flash -mcuboot_secondary_2: - address: 0x150000 - size: 0x21000 - device: MX25R64 - region: external_flash -external_flash: - address: 0x171000 - size: 0x68F000 - device: MX25R64 - region: external_flash -pcd_sram: - address: 0x20000000 - size: 0x2000 - region: sram_primary diff --git a/samples/matter/template/pm_static_nrf54l15dk_nrf54l10_cpuapp.yml b/samples/matter/template/pm_static_nrf54l15dk_nrf54l10_cpuapp.yml deleted file mode 100644 index a4ccdb2eeac1..000000000000 --- a/samples/matter/template/pm_static_nrf54l15dk_nrf54l10_cpuapp.yml +++ /dev/null @@ -1,56 +0,0 @@ -mcuboot: - address: 0x0 - region: flash_primary - size: 0xD000 -mcuboot_pad: - address: 0xD000 - region: flash_primary - size: 0x1000 -app: - address: 0xE000 - region: flash_primary - size: 0xE4000 -mcuboot_primary: - orig_span: &id001 - - mcuboot_pad - - app - span: *id001 - address: 0xD000 - region: flash_primary - size: 0xE5000 -mcuboot_primary_app: - orig_span: &id002 - - app - span: *id002 - address: 0xE000 - region: flash_primary - size: 0xE4000 -factory_data: - address: 0xF2000 - region: flash_primary - size: 0x1000 -settings_storage: - address: 0xF3000 - region: flash_primary - size: 0xA000 -mcuboot_secondary: - address: 0x0 - orig_span: &id003 - - mcuboot_secondary_pad - - mcuboot_secondary_app - region: external_flash - size: 0xE5000 - span: *id003 -mcuboot_secondary_pad: - region: external_flash - address: 0x0 - size: 0x1000 -mcuboot_secondary_app: - region: external_flash - address: 0x1000 - size: 0xE4000 -external_flash: - address: 0xE5000 - size: 0x71B000 - device: MX25R64 - region: external_flash diff --git a/samples/matter/template/pm_static_nrf54l15dk_nrf54l15_cpuapp.yml b/samples/matter/template/pm_static_nrf54l15dk_nrf54l15_cpuapp.yml deleted file mode 100644 index a8e64916b893..000000000000 --- a/samples/matter/template/pm_static_nrf54l15dk_nrf54l15_cpuapp.yml +++ /dev/null @@ -1,56 +0,0 @@ -mcuboot: - address: 0x0 - region: flash_primary - size: 0xD000 -mcuboot_pad: - address: 0xD000 - region: flash_primary - size: 0x800 -app: - address: 0xD800 - region: flash_primary - size: 0x164800 -mcuboot_primary: - orig_span: &id001 - - mcuboot_pad - - app - span: *id001 - address: 0xD000 - region: flash_primary - size: 0x165000 -mcuboot_primary_app: - orig_span: &id002 - - app - span: *id002 - address: 0xD800 - region: flash_primary - size: 0x164800 -factory_data: - address: 0x172000 - region: flash_primary - size: 0x1000 -settings_storage: - address: 0x173000 - region: flash_primary - size: 0xA000 -mcuboot_secondary: - address: 0x0 - orig_span: &id003 - - mcuboot_secondary_pad - - mcuboot_secondary_app - region: external_flash - size: 0x165000 - span: *id003 -mcuboot_secondary_pad: - region: external_flash - address: 0x0 - size: 0x800 -mcuboot_secondary_app: - region: external_flash - address: 0x800 - size: 0x164800 -external_flash: - address: 0x165000 - size: 0x69B000 - device: MX25R64 - region: external_flash diff --git a/samples/matter/template/pm_static_nrf54l15dk_nrf54l15_cpuapp_internal.yml b/samples/matter/template/pm_static_nrf54l15dk_nrf54l15_cpuapp_internal.yml deleted file mode 100644 index a8bcbce256bf..000000000000 --- a/samples/matter/template/pm_static_nrf54l15dk_nrf54l15_cpuapp_internal.yml +++ /dev/null @@ -1,52 +0,0 @@ -mcuboot: - address: 0x0 - region: flash_primary - size: 0xD000 -mcuboot_pad: - address: 0xD000 - region: flash_primary - size: 0x800 -app: - address: 0xD800 - region: flash_primary - size: 0xD7800 -mcuboot_primary: - address: 0xD000 - orig_span: &id001 - - app - - mcuboot_pad - region: flash_primary - size: 0xD8000 - span: *id001 -mcuboot_primary_app: - address: 0xD800 - orig_span: &id002 - - app - region: flash_primary - size: 0xD7800 - span: *id002 -mcuboot_secondary: - address: 0xE5000 - orig_span: &id003 - - mcuboot_secondary_pad - - mcuboot_secondary_app - region: flash_primary - size: 0x8D000 - span: *id003 -mcuboot_secondary_pad: - region: flash_primary - address: 0xE5000 - size: 0x800 -# Compression rate 34.80% -mcuboot_secondary_app: - region: flash_primary - address: 0xE5800 - size: 0x8C800 -factory_data: - address: 0x172000 - region: flash_primary - size: 0x1000 -settings_storage: - address: 0x173000 - region: flash_primary - size: 0xA000 diff --git a/samples/matter/template/pm_static_nrf54l15dk_nrf54l15_cpuapp_ns.yml b/samples/matter/template/pm_static_nrf54l15dk_nrf54l15_cpuapp_ns.yml deleted file mode 100644 index b34558ee9e2d..000000000000 --- a/samples/matter/template/pm_static_nrf54l15dk_nrf54l15_cpuapp_ns.yml +++ /dev/null @@ -1,141 +0,0 @@ -### Partitions -mcuboot: - address: 0x0 - region: flash_primary - size: 0xD000 -mcuboot_pad: - address: 0xD000 - region: flash_primary - size: 0x800 -tfm: - address: 0xD800 - region: flash_primary - size: 0x1F800 -app: - address: 0x2D000 - region: flash_primary - size: 0x13D000 -factory_data: - address: 0x16A000 - region: flash_primary - size: 0x1000 -settings_storage: - address: 0x16B000 - region: flash_primary - size: 0xA000 -tfm_storage: - address: 0x175000 - orig_span: &id006 - - tfm_ps - - tfm_its - - tfm_otp_nv_counters - region: flash_primary - size: 0x8000 - span: *id006 -external_flash: - address: 0x15D000 - size: 0x6A3000 - device: MX25R64 - region: external_flash -### Bootloader configuration -mcuboot_primary: - orig_span: &id001 - - mcuboot_pad - - tfm - - app - span: *id001 - address: 0xD000 - region: flash_primary - size: 0x15D000 -mcuboot_primary_app: - orig_span: &id002 - - app - - tfm - span: *id002 - address: 0xD800 - region: flash_primary - size: 0x15C800 -mcuboot_secondary: - address: 0x0 - orig_span: &id003 - - mcuboot_secondary_pad - - mcuboot_secondary_app - region: external_flash - size: 0x15D000 - span: *id003 -mcuboot_secondary_pad: - region: external_flash - address: 0x0 - size: 0x800 -mcuboot_secondary_app: - region: external_flash - address: 0x800 - size: 0x15C800 -### TFM configuration -tfm_secure: - address: 0xD000 - orig_span: &id004 - - mcuboot_pad - - tfm - region: flash_primary - size: 0x20000 - span: *id004 -tfm_nonsecure: - address: 0x2D000 - orig_span: &id005 - - app - region: flash_primary - size: 0x13D000 - span: *id005 -tfm_its: - address: 0x175000 - inside: - - tfm_storage - placement: - before: - - tfm_otp_nv_counters - region: flash_primary - size: 0x2000 -tfm_otp_nv_counters: - address: 0x177000 - inside: - - tfm_storage - placement: - before: - - tfm_ps - region: flash_primary - size: 0x2000 -tfm_ps: - address: 0x179000 - inside: - - tfm_storage - region: flash_primary - size: 0x4000 -### RAM -sram_secure: - address: 0x20000000 - orig_span: &id007 - - tfm_sram - region: sram_primary - size: 0xF000 - span: *id007 -sram_nonsecure: - address: 0x2000F000 - orig_span: &id008 - - sram_primary - region: sram_primary - size: 0x31000 - span: *id008 -tfm_sram: - address: 0x20000000 - inside: - - sram_secure - placement: - after: - - start - region: sram_primary - size: 0xF000 -sram_primary: - address: 0x2000F000 - region: sram_primary - size: 0x31000 diff --git a/samples/matter/template/pm_static_nrf54l15tag_nrf54l15_cpuapp.yml b/samples/matter/template/pm_static_nrf54l15tag_nrf54l15_cpuapp.yml deleted file mode 100644 index a8bcbce256bf..000000000000 --- a/samples/matter/template/pm_static_nrf54l15tag_nrf54l15_cpuapp.yml +++ /dev/null @@ -1,52 +0,0 @@ -mcuboot: - address: 0x0 - region: flash_primary - size: 0xD000 -mcuboot_pad: - address: 0xD000 - region: flash_primary - size: 0x800 -app: - address: 0xD800 - region: flash_primary - size: 0xD7800 -mcuboot_primary: - address: 0xD000 - orig_span: &id001 - - app - - mcuboot_pad - region: flash_primary - size: 0xD8000 - span: *id001 -mcuboot_primary_app: - address: 0xD800 - orig_span: &id002 - - app - region: flash_primary - size: 0xD7800 - span: *id002 -mcuboot_secondary: - address: 0xE5000 - orig_span: &id003 - - mcuboot_secondary_pad - - mcuboot_secondary_app - region: flash_primary - size: 0x8D000 - span: *id003 -mcuboot_secondary_pad: - region: flash_primary - address: 0xE5000 - size: 0x800 -# Compression rate 34.80% -mcuboot_secondary_app: - region: flash_primary - address: 0xE5800 - size: 0x8C800 -factory_data: - address: 0x172000 - region: flash_primary - size: 0x1000 -settings_storage: - address: 0x173000 - region: flash_primary - size: 0xA000 diff --git a/samples/matter/template/pm_static_nrf54lm20dk_nrf54lm20a_cpuapp.yml b/samples/matter/template/pm_static_nrf54lm20dk_nrf54lm20a_cpuapp.yml deleted file mode 100644 index 3e9051d5b84d..000000000000 --- a/samples/matter/template/pm_static_nrf54lm20dk_nrf54lm20a_cpuapp.yml +++ /dev/null @@ -1,56 +0,0 @@ -mcuboot: - address: 0x0 - region: flash_primary - size: 0xD000 -mcuboot_pad: - address: 0xD000 - region: flash_primary - size: 0x800 -app: - address: 0xD800 - region: flash_primary - size: 0x1E2800 -mcuboot_primary: - address: 0xD000 - orig_span: &id001 - - app - - mcuboot_pad - region: flash_primary - size: 0x1E3000 - span: *id001 -mcuboot_primary_app: - address: 0xD800 - orig_span: &id002 - - app - region: flash_primary - size: 0x1E2800 - span: *id002 -factory_data: - address: 0x1F0000 - region: flash_primary - size: 0x1000 -settings_storage: - address: 0x1F1000 - region: flash_primary - size: 0xC000 -mcuboot_secondary: - address: 0x0 - orig_span: &id003 - - mcuboot_secondary_pad - - mcuboot_secondary_app - region: external_flash - size: 0x1E3000 - span: *id003 -mcuboot_secondary_pad: - region: external_flash - address: 0x0 - size: 0x800 -mcuboot_secondary_app: - region: external_flash - address: 0x800 - size: 0x1E2800 -external_flash: - address: 0x1E3000 - size: 0x5DB000 - device: MX25R64 - region: external_flash diff --git a/samples/matter/template/pm_static_nrf54lm20dk_nrf54lm20a_cpuapp_internal.yml b/samples/matter/template/pm_static_nrf54lm20dk_nrf54lm20a_cpuapp_internal.yml deleted file mode 100644 index 028bb179c50e..000000000000 --- a/samples/matter/template/pm_static_nrf54lm20dk_nrf54lm20a_cpuapp_internal.yml +++ /dev/null @@ -1,52 +0,0 @@ -mcuboot: - address: 0x0 - region: flash_primary - size: 0xA000 -mcuboot_pad: - address: 0xA000 - region: flash_primary - size: 0x800 -app: - address: 0xA800 - region: flash_primary - size: 0x125800 -mcuboot_primary: - address: 0xA000 - orig_span: &id001 - - app - - mcuboot_pad - region: flash_primary - size: 0x126000 - span: *id001 -mcuboot_primary_app: - address: 0xA800 - orig_span: &id002 - - app - region: flash_primary - size: 0x125800 - span: *id002 -mcuboot_secondary: - address: 0x130000 - orig_span: &id003 - - mcuboot_secondary_pad - - mcuboot_secondary_app - region: flash_primary - size: 0xC0000 - span: *id003 -mcuboot_secondary_pad: - region: flash_primary - address: 0x130000 - size: 0x800 -# Compression rate 34.75% -mcuboot_secondary_app: - region: flash_primary - address: 0x130800 - size: 0xBF800 -factory_data: - address: 0x1F0000 - region: flash_primary - size: 0x1000 -settings_storage: - address: 0x1F1000 - region: flash_primary - size: 0xC000 diff --git a/samples/matter/template/pm_static_nrf54lm20dk_nrf54lm20b_cpuapp.yml b/samples/matter/template/pm_static_nrf54lm20dk_nrf54lm20b_cpuapp.yml deleted file mode 100644 index 3e9051d5b84d..000000000000 --- a/samples/matter/template/pm_static_nrf54lm20dk_nrf54lm20b_cpuapp.yml +++ /dev/null @@ -1,56 +0,0 @@ -mcuboot: - address: 0x0 - region: flash_primary - size: 0xD000 -mcuboot_pad: - address: 0xD000 - region: flash_primary - size: 0x800 -app: - address: 0xD800 - region: flash_primary - size: 0x1E2800 -mcuboot_primary: - address: 0xD000 - orig_span: &id001 - - app - - mcuboot_pad - region: flash_primary - size: 0x1E3000 - span: *id001 -mcuboot_primary_app: - address: 0xD800 - orig_span: &id002 - - app - region: flash_primary - size: 0x1E2800 - span: *id002 -factory_data: - address: 0x1F0000 - region: flash_primary - size: 0x1000 -settings_storage: - address: 0x1F1000 - region: flash_primary - size: 0xC000 -mcuboot_secondary: - address: 0x0 - orig_span: &id003 - - mcuboot_secondary_pad - - mcuboot_secondary_app - region: external_flash - size: 0x1E3000 - span: *id003 -mcuboot_secondary_pad: - region: external_flash - address: 0x0 - size: 0x800 -mcuboot_secondary_app: - region: external_flash - address: 0x800 - size: 0x1E2800 -external_flash: - address: 0x1E3000 - size: 0x5DB000 - device: MX25R64 - region: external_flash diff --git a/samples/matter/template/pm_static_nrf54lm20dk_nrf54lm20b_cpuapp_internal.yml b/samples/matter/template/pm_static_nrf54lm20dk_nrf54lm20b_cpuapp_internal.yml deleted file mode 100644 index 028bb179c50e..000000000000 --- a/samples/matter/template/pm_static_nrf54lm20dk_nrf54lm20b_cpuapp_internal.yml +++ /dev/null @@ -1,52 +0,0 @@ -mcuboot: - address: 0x0 - region: flash_primary - size: 0xA000 -mcuboot_pad: - address: 0xA000 - region: flash_primary - size: 0x800 -app: - address: 0xA800 - region: flash_primary - size: 0x125800 -mcuboot_primary: - address: 0xA000 - orig_span: &id001 - - app - - mcuboot_pad - region: flash_primary - size: 0x126000 - span: *id001 -mcuboot_primary_app: - address: 0xA800 - orig_span: &id002 - - app - region: flash_primary - size: 0x125800 - span: *id002 -mcuboot_secondary: - address: 0x130000 - orig_span: &id003 - - mcuboot_secondary_pad - - mcuboot_secondary_app - region: flash_primary - size: 0xC0000 - span: *id003 -mcuboot_secondary_pad: - region: flash_primary - address: 0x130000 - size: 0x800 -# Compression rate 34.75% -mcuboot_secondary_app: - region: flash_primary - address: 0x130800 - size: 0xBF800 -factory_data: - address: 0x1F0000 - region: flash_primary - size: 0x1000 -settings_storage: - address: 0x1F1000 - region: flash_primary - size: 0xC000 diff --git a/samples/matter/template/pm_static_nrf7002dk_nrf5340_cpuapp.yml b/samples/matter/template/pm_static_nrf7002dk_nrf5340_cpuapp.yml deleted file mode 100644 index 3f4cbba2e822..000000000000 --- a/samples/matter/template/pm_static_nrf7002dk_nrf5340_cpuapp.yml +++ /dev/null @@ -1,80 +0,0 @@ -mcuboot: - address: 0x0 - size: 0xC000 - region: flash_primary -mcuboot_pad: - address: 0xC000 - size: 0x200 -app: - address: 0xC200 - size: 0xeae00 -mcuboot_primary: - orig_span: &id001 - - mcuboot_pad - - app - span: *id001 - address: 0xC000 - size: 0xeb000 - region: flash_primary -mcuboot_primary_app: - orig_span: &id002 - - app - span: *id002 - address: 0xC200 - size: 0xeae00 -factory_data: - address: 0xf7000 - size: 0x1000 - region: flash_primary -settings_storage: - address: 0xf8000 - size: 0x8000 - region: flash_primary -mcuboot_primary_1: - address: 0x0 - size: 0x40000 - device: flash_ctrl - region: ram_flash -mcuboot_secondary: - address: 0x0 - size: 0xeb000 - device: MX25R64 - region: external_flash -mcuboot_secondary_1: - address: 0xeb000 - size: 0x40000 - device: MX25R64 - region: external_flash -nrf70_wifi_fw_mcuboot_pad: - address: 0x12B000 - size: 0x200 - device: MX25R64 - region: external_flash -nrf70_wifi_fw: - address: 0x12B200 - size: 0x20000 - device: MX25R64 - region: external_flash -mcuboot_primary_2: - orig_span: &id003 - - nrf70_wifi_fw_mcuboot_pad - - nrf70_wifi_fw - span: *id003 - address: 0x12B000 - size: 0x21000 - device: MX25R64 - region: external_flash -mcuboot_secondary_2: - address: 0x14C000 - size: 0x21000 - device: MX25R64 - region: external_flash -external_flash: - address: 0x16D000 - size: 0x693000 - device: MX25R64 - region: external_flash -pcd_sram: - address: 0x20000000 - size: 0x2000 - region: sram_primary diff --git a/samples/matter/template/sample.yaml b/samples/matter/template/sample.yaml index 1712245a5e5a..e4db798a52f6 100644 --- a/samples/matter/template/sample.yaml +++ b/samples/matter/template/sample.yaml @@ -73,8 +73,6 @@ tests: build_only: true extra_args: - FILE_SUFFIX=release - - SB_CONFIG_BOOTLOADER_MCUBOOT=y - - SB_CONFIG_PARTITION_MANAGER=y - template_SHIELD=nrf7002eb2 - SB_CONFIG_WIFI_NRF70=y integration_platforms: diff --git a/samples/matter/template/sysbuild.conf b/samples/matter/template/sysbuild.conf index 08394759913c..23369f0c2e89 100644 --- a/samples/matter/template/sysbuild.conf +++ b/samples/matter/template/sysbuild.conf @@ -5,3 +5,4 @@ # SB_CONFIG_MATTER=y +SB_CONFIG_PARTITION_MANAGER=n diff --git a/samples/matter/template/sysbuild/b0n/boards/nrf5340dk_nrf5340_cpunet.overlay b/samples/matter/template/sysbuild/b0n/boards/nrf5340dk_nrf5340_cpunet.overlay new file mode 100644 index 000000000000..632c0e6795f3 --- /dev/null +++ b/samples/matter/template/sysbuild/b0n/boards/nrf5340dk_nrf5340_cpunet.overlay @@ -0,0 +1,13 @@ +/* + * Copyright (c) 2026 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +#include + +/ { + chosen { + zephyr,code-partition = &b0n_partition; + }; +}; diff --git a/samples/matter/template/sysbuild/b0n/boards/nrf7002dk_nrf5340_cpunet.overlay b/samples/matter/template/sysbuild/b0n/boards/nrf7002dk_nrf5340_cpunet.overlay new file mode 100644 index 000000000000..632c0e6795f3 --- /dev/null +++ b/samples/matter/template/sysbuild/b0n/boards/nrf7002dk_nrf5340_cpunet.overlay @@ -0,0 +1,13 @@ +/* + * Copyright (c) 2026 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +#include + +/ { + chosen { + zephyr,code-partition = &b0n_partition; + }; +}; diff --git a/samples/matter/template/sysbuild/b0n/prj.conf b/samples/matter/template/sysbuild/b0n/prj.conf new file mode 100644 index 000000000000..dd94bdaf0a98 --- /dev/null +++ b/samples/matter/template/sysbuild/b0n/prj.conf @@ -0,0 +1,37 @@ +# +# Copyright (c) 2020 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# +CONFIG_NCS_SAMPLES_DEFAULTS=n + +CONFIG_IS_SECURE_BOOTLOADER=y +CONFIG_MULTITHREADING=n +CONFIG_GPIO=n +CONFIG_ARM_MPU=n +CONFIG_TICKLESS_KERNEL=n +CONFIG_ERRNO=n +CONFIG_SYS_CLOCK_EXISTS=y +CONFIG_FPROTECT=y +CONFIG_FW_INFO=y +CONFIG_SECURE_BOOT_CRYPTO=y +CONFIG_SECURE_BOOT_VALIDATION=y +CONFIG_SECURE_BOOT_STORAGE=y +CONFIG_PCD_NET=y +CONFIG_FLASH=y +CONFIG_FLASH_PAGE_LAYOUT=y +CONFIG_USE_DT_CODE_PARTITION=y + +CONFIG_LOG=n +CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n +CONFIG_PRINTK=n +CONFIG_CONSOLE=n +CONFIG_UART_CONSOLE=n +CONFIG_SERIAL=n +CONFIG_ASSERT=n +CONFIG_NRF_RTC_TIMER=n +CONFIG_RESET_ON_FATAL_ERROR=n +CONFIG_REBOOT=n +CONFIG_SYS_CLOCK_EXISTS=n +CONFIG_TIMEOUT_64BIT=n diff --git a/samples/matter/template/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.overlay b/samples/matter/template/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.overlay new file mode 100644 index 000000000000..bbfdde5ab0d6 --- /dev/null +++ b/samples/matter/template/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.overlay @@ -0,0 +1,7 @@ +/* + * Copyright (c) 2026 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +#include diff --git a/samples/matter/template/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.overlay b/samples/matter/template/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.overlay new file mode 100644 index 000000000000..bbfdde5ab0d6 --- /dev/null +++ b/samples/matter/template/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.overlay @@ -0,0 +1,7 @@ +/* + * Copyright (c) 2026 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +#include diff --git a/samples/matter/template/sysbuild/mcuboot/boards/nrf52840dk_nrf52840.overlay b/samples/matter/template/sysbuild/mcuboot/boards/nrf52840dk_nrf52840.overlay index 6ea64210d733..a48a2005bbde 100644 --- a/samples/matter/template/sysbuild/mcuboot/boards/nrf52840dk_nrf52840.overlay +++ b/samples/matter/template/sysbuild/mcuboot/boards/nrf52840dk_nrf52840.overlay @@ -4,9 +4,15 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ +#include + / { chosen { zephyr,code-partition = &boot_partition; nordic,pm-ext-flash = &mx25r64; }; }; + +&mx25r64 { + status = "okay"; +}; diff --git a/samples/matter/template/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.conf b/samples/matter/template/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.conf index 888af8dceec1..52d5b30dac31 100644 --- a/samples/matter/template/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.conf +++ b/samples/matter/template/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.conf @@ -7,3 +7,8 @@ CONFIG_NORDIC_QSPI_NOR=y CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16 + +CONFIG_MCUBOOT_VERIFY_IMG_ADDRESS=n +CONFIG_NRF53_MULTI_IMAGE_UPDATE=y +CONFIG_FLASH_SIMULATOR_STATS=n +CONFIG_FLASH_SIMULATOR_DOUBLE_WRITES=y diff --git a/samples/matter/template/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/matter/template/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay index 9f0d73503b7b..4708f19e082b 100644 --- a/samples/matter/template/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/samples/matter/template/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -4,6 +4,8 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ +#include + / { chosen { zephyr,code-partition = &boot_partition; @@ -11,6 +13,10 @@ }; }; +&mx25r64 { + status = "okay"; +}; + /* Disable GPIO forwarder for nRF7002 EK compatibility */ &gpio_fwd { status = "disabled"; diff --git a/samples/matter/template/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l10_cpuapp.overlay b/samples/matter/template/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l10_cpuapp.overlay index 581c022ef176..fe2b378727b5 100644 --- a/samples/matter/template/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l10_cpuapp.overlay +++ b/samples/matter/template/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l10_cpuapp.overlay @@ -4,22 +4,15 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ +#include + / { chosen { + zephyr,code-partition = &boot_partition; nordic,pm-ext-flash = &mx25r64; }; }; -/* restore full RRAM and SRAM space - by default some parts are dedicated to FLRP */ -&cpuapp_rram { - reg = <0x0 DT_SIZE_K(1012)>; -}; - -&cpuapp_sram { - reg = <0x20000000 DT_SIZE_K(192)>; - ranges = <0x0 0x20000000 DT_SIZE_K(192)>; -}; - &mx25r64 { status = "okay"; }; diff --git a/samples/matter/template/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/template/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf index d204a2c0f7b4..aefa3107e579 100644 --- a/samples/matter/template/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/matter/template/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -16,9 +16,6 @@ CONFIG_SPI_NOR=y CONFIG_SPI_NOR_SFDP_DEVICETREE=y CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -# Adjust the maximum sectors to the app image size of ~1.4MB -CONFIG_BOOT_MAX_IMG_SECTORS=512 - # Currently, without tickless kernel, the SYSCOUNTER value after the software # reset is not set properly and due to that the first system interrupt is not called # in the proper time - the SYSCOUNTER value is set to the value from before diff --git a/samples/matter/template/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/samples/matter/template/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.overlay index 87fb59e21ec8..b0187ba6d72c 100644 --- a/samples/matter/template/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.overlay +++ b/samples/matter/template/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.overlay @@ -4,22 +4,15 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ +#include + / { chosen { + zephyr,code-partition = &boot_partition; nordic,pm-ext-flash = &mx25r64; }; }; -/* restore full RRAM and SRAM space - by default some parts are dedicated to FLRP */ -&cpuapp_rram { - reg = <0x0 DT_SIZE_K(1524)>; -}; - -&cpuapp_sram { - reg = <0x20000000 DT_SIZE_K(256)>; - ranges = <0x0 0x20000000 0x40000>; -}; - &mx25r64 { status = "okay"; }; diff --git a/samples/matter/template/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp_internal.overlay b/samples/matter/template/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp_internal.overlay index 594c2d340c89..9f2d141f8d43 100644 --- a/samples/matter/template/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp_internal.overlay +++ b/samples/matter/template/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp_internal.overlay @@ -4,20 +4,10 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -/* restore full RRAM and SRAM space - by default some parts are dedicated to FLRP */ -&cpuapp_rram { - reg = <0x0 DT_SIZE_K(1524)>; -}; - -&cpuapp_sram { - reg = <0x20000000 DT_SIZE_K(256)>; - ranges = <0x0 0x20000000 0x40000>; -}; +#include -/* Disable the external flash, as it's not needed - * for the configuration with secondary slot residing - * in the internal RRAM. - */ -&mx25r64 { - status = "disabled"; +/ { + chosen { + zephyr,code-partition = &boot_partition; + }; }; diff --git a/samples/matter/template/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf b/samples/matter/template/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf new file mode 100644 index 000000000000..08e089647058 --- /dev/null +++ b/samples/matter/template/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf @@ -0,0 +1,26 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# TODO: Workaround, disable memory guard to avoid false faults in application after boot +CONFIG_HW_STACK_PROTECTION=n + +CONFIG_BOOT_WATCHDOG_FEED=n + +# nRF54L15DK uses SPI NOR external flash +CONFIG_GPIO=y +CONFIG_SPI=y +CONFIG_SPI_NOR=y +CONFIG_SPI_NOR_SFDP_DEVICETREE=y +CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 + +# Currently, without tickless kernel, the SYSCOUNTER value after the software +# reset is not set properly and due to that the first system interrupt is not called +# in the proper time - the SYSCOUNTER value is set to the value from before +# reset + 1. Hence, the reboot time increases more and more. +# To avoid it enable tickles kernel for mcuboot. +CONFIG_TICKLESS_KERNEL=y + +CONFIG_FPROTECT=n diff --git a/samples/matter/template/sysbuild/mcuboot/boards/nrf54l15tag_nrf54l15_cpuapp.overlay b/samples/matter/template/sysbuild/mcuboot/boards/nrf54l15tag_nrf54l15_cpuapp.overlay index 498bb6b245ec..28632679ec75 100644 --- a/samples/matter/template/sysbuild/mcuboot/boards/nrf54l15tag_nrf54l15_cpuapp.overlay +++ b/samples/matter/template/sysbuild/mcuboot/boards/nrf54l15tag_nrf54l15_cpuapp.overlay @@ -4,12 +4,10 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -/* restore full RRAM and SRAM space - by default some parts are dedicated to FLRP */ -&cpuapp_rram { - reg = <0x0 DT_SIZE_K(1524)>; -}; +#include -&cpuapp_sram { - reg = <0x20000000 DT_SIZE_K(256)>; - ranges = <0x0 0x20000000 0x40000>; +/ { + chosen { + zephyr,code-partition = &boot_partition; + }; }; diff --git a/samples/matter/template/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf b/samples/matter/template/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf index eb809a84a9fa..d1441e73d412 100644 --- a/samples/matter/template/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf +++ b/samples/matter/template/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf @@ -14,9 +14,6 @@ CONFIG_SPI_NOR=y CONFIG_SPI_NOR_SFDP_DEVICETREE=y CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -# Increase the maximum number of sectors to 512 to fit the big image size (> 1024 kB). -CONFIG_BOOT_MAX_IMG_SECTORS=512 - # Currently, without tickless kernel, the SYSCOUNTER value after the software # reset is not set properly and due to that the first system interrupt is not called # in the proper time - the SYSCOUNTER value is set to the value from before diff --git a/samples/matter/template/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay b/samples/matter/template/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay index 51079fe073f4..475cfc215e40 100644 --- a/samples/matter/template/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay +++ b/samples/matter/template/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay @@ -4,19 +4,15 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ +#include + / { chosen { + zephyr,code-partition = &boot_partition; nordic,pm-ext-flash = &mx25r64; }; }; -&rram_controller { - cpuapp_rram: rram@0 { - reg = <0x0 DT_SIZE_K(2036)>; - ranges = <0x0 0x0 DT_SIZE_K(2036)>; - }; -}; - &mx25r64 { status = "okay"; }; diff --git a/samples/matter/template/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp_internal.conf b/samples/matter/template/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp_internal.conf index 9010d99d03a8..209466d403e8 100644 --- a/samples/matter/template/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp_internal.conf +++ b/samples/matter/template/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp_internal.conf @@ -19,9 +19,6 @@ CONFIG_PRINTK=n CONFIG_SPI_NOR=n CONFIG_SPI=n -# Increase the maximum number of sectors to 512 to fit the big image size (> 1024 kB). -CONFIG_BOOT_MAX_IMG_SECTORS=512 - # Currently, without tickless kernel, the SYSCOUNTER value after the software # reset is not set properly and due to that the first system interrupt is not called # in the proper time - the SYSCOUNTER value is set to the value from before diff --git a/samples/matter/template/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp_internal.overlay b/samples/matter/template/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp_internal.overlay index 607cbcc17d9b..8abe06ae316a 100644 --- a/samples/matter/template/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp_internal.overlay +++ b/samples/matter/template/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp_internal.overlay @@ -4,17 +4,10 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -&rram_controller { - cpuapp_rram: rram@0 { - reg = <0x0 DT_SIZE_K(2036)>; - ranges = <0x0 0x0 DT_SIZE_K(2036)>; - }; -}; +#include -/* Disable the external flash, as it's not needed - * for the configuration with secondary slot residing - * in the internal RRAM. - */ -&mx25r64 { - status = "disabled"; +/ { + chosen { + zephyr,code-partition = &boot_partition; + }; }; diff --git a/samples/matter/template/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20b_cpuapp.conf b/samples/matter/template/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20b_cpuapp.conf index 44090ab35365..7e71780323ff 100644 --- a/samples/matter/template/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20b_cpuapp.conf +++ b/samples/matter/template/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20b_cpuapp.conf @@ -14,9 +14,6 @@ CONFIG_SPI_NOR=y CONFIG_SPI_NOR_SFDP_DEVICETREE=y CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -# Increase the maximum number of sectors to 512 to fit the big image size (> 1024 kB). -CONFIG_BOOT_MAX_IMG_SECTORS=512 - # Currently, without tickless kernel, the SYSCOUNTER value after the software # reset is not set properly and due to that the first system interrupt is not called # in the proper time - the SYSCOUNTER value is set to the value from before diff --git a/samples/matter/template/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20b_cpuapp.overlay b/samples/matter/template/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20b_cpuapp.overlay index 107cc4e13d34..c8a28063f3f7 100644 --- a/samples/matter/template/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20b_cpuapp.overlay +++ b/samples/matter/template/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20b_cpuapp.overlay @@ -4,19 +4,15 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ +#include + / { chosen { + zephyr,code-partition = &boot_partition; nordic,pm-ext-flash = &mx25r64; }; }; -&rram_controller { - cpuapp_rram: rram@0 { - reg = <0x0 DT_SIZE_K(2036)>; - ranges = <0x0 0x0 DT_SIZE_K(2036)>; - }; -}; - &mx25r64 { status = "okay"; }; diff --git a/samples/matter/template/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20b_cpuapp_internal.conf b/samples/matter/template/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20b_cpuapp_internal.conf index 6c7dd5dc6025..6e63fe52c685 100644 --- a/samples/matter/template/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20b_cpuapp_internal.conf +++ b/samples/matter/template/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20b_cpuapp_internal.conf @@ -19,9 +19,6 @@ CONFIG_PRINTK=n CONFIG_SPI_NOR=n CONFIG_SPI=n -# Increase the maximum number of sectors to 512 to fit the big image size (> 1024 kB). -CONFIG_BOOT_MAX_IMG_SECTORS=512 - # Currently, without tickless kernel, the SYSCOUNTER value after the software # reset is not set properly and due to that the first system interrupt is not called # in the proper time - the SYSCOUNTER value is set to the value from before diff --git a/samples/matter/template/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20b_cpuapp_internal.overlay b/samples/matter/template/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20b_cpuapp_internal.overlay index 0e0947f28a76..cb39b0ecd589 100644 --- a/samples/matter/template/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20b_cpuapp_internal.overlay +++ b/samples/matter/template/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20b_cpuapp_internal.overlay @@ -4,17 +4,10 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -&rram_controller { - cpuapp_rram: rram@0 { - reg = <0x0 DT_SIZE_K(2036)>; - ranges = <0x0 0x0 DT_SIZE_K(2036)>; - }; -}; +#include -/* Disable the external flash, as it's not needed - * for the configuration with secondary slot residing - * in the internal RRAM. - */ -&mx25r64 { - status = "disabled"; +/ { + chosen { + zephyr,code-partition = &boot_partition; + }; }; diff --git a/samples/matter/template/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf b/samples/matter/template/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf index b480468aa6ab..fe8190f0359d 100644 --- a/samples/matter/template/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf +++ b/samples/matter/template/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf @@ -11,13 +11,10 @@ CONFIG_SPI_NOR=y CONFIG_SPI_NOR_SFDP_DEVICETREE=y CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -# The following configurations are required to support simultaneous multi-image update -CONFIG_PCD_APP=y - -# The network core cannot access external flash directly. The flash simulator must be used to -# provide a memory region that is used to forward the new firmware to the network core. -CONFIG_FLASH_SIMULATOR=y -CONFIG_FLASH_SIMULATOR_DOUBLE_WRITES=y +CONFIG_MCUBOOT_VERIFY_IMG_ADDRESS=n +CONFIG_NRF53_MULTI_IMAGE_UPDATE=y CONFIG_FLASH_SIMULATOR_STATS=n +CONFIG_FLASH_SIMULATOR_DOUBLE_WRITES=y -CONFIG_ZCBOR=y +CONFIG_MCUBOOT_VERIFY_IMG_ADDRESS=n +CONFIG_NRF53_MULTI_IMAGE_UPDATE=y diff --git a/samples/matter/template/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay b/samples/matter/template/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay index 6ea64210d733..6b0620b9798e 100644 --- a/samples/matter/template/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay +++ b/samples/matter/template/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.overlay @@ -4,9 +4,15 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ +#include + / { chosen { zephyr,code-partition = &boot_partition; nordic,pm-ext-flash = &mx25r64; }; }; + +&mx25r64 { + status = "okay"; +}; diff --git a/samples/matter/template/sysbuild/mcuboot/prj.conf b/samples/matter/template/sysbuild/mcuboot/prj.conf index 243b5b97dcb7..b3a5b0287a06 100644 --- a/samples/matter/template/sysbuild/mcuboot/prj.conf +++ b/samples/matter/template/sysbuild/mcuboot/prj.conf @@ -22,7 +22,7 @@ CONFIG_UART_CONSOLE=n CONFIG_USE_SEGGER_RTT=n CONFIG_GPIO=n -CONFIG_BOOT_MAX_IMG_SECTORS=256 +CONFIG_BOOT_MAX_IMG_SECTORS_AUTO=y CONFIG_LOG=n CONFIG_CONSOLE_HANDLER=n diff --git a/samples/matter/template/sysbuild_internal.conf b/samples/matter/template/sysbuild_internal.conf index ea4e5b8487f1..48268d2c687a 100644 --- a/samples/matter/template/sysbuild_internal.conf +++ b/samples/matter/template/sysbuild_internal.conf @@ -5,8 +5,7 @@ # SB_CONFIG_MATTER=y -SB_CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=n -SB_CONFIG_PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY=n +SB_CONFIG_PARTITION_MANAGER=n # Enable the DFU image compression. SB_CONFIG_MCUBOOT_MODE_OVERWRITE_ONLY=y