Skip to content

Deprecate Partition Manager in Matter - phase 1 #28226

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ArekBalysNordic merged 3 commits into from
Apr 27, 2026
Merged

Deprecate Partition Manager in Matter - phase 1 #28226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a0ea2ce
dts: Define common dtsi partition map for Matter
ArekBalysNordic Apr 16, 2026
f68984e
sysbuild: Align Matter to non-PM builds
ArekBalysNordic Apr 16, 2026
8c1a206
samples: matter: Switch Matter Tempate sample to non-PM build
ArekBalysNordic Apr 16, 2026
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
51 changes: 51 additions & 0 deletions dts/samples/matter/nrf52840_partitions.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
/*
* Copyright (c) 2026 Nordic Semiconductor ASA
Comment thread
nordicjm marked this conversation as resolved.
*
* 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)>;
};
};
};
58 changes: 58 additions & 0 deletions dts/samples/matter/nrf5340_cpuapp_partitions.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)>;
};
};
};
29 changes: 29 additions & 0 deletions dts/samples/matter/nrf5340_cpunet_partitions.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)>;
};
};
};
55 changes: 55 additions & 0 deletions dts/samples/matter/nrf54l10_cpuapp_partitions.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)>;
};

Comment on lines +7 to +12
Copy link
Copy Markdown
Contributor

@nordicjm nordicjm Apr 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can be dropped since upmerge has this on boards

/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)>;
};
};
};
47 changes: 47 additions & 0 deletions dts/samples/matter/nrf54l15_cpuapp_internal_partitions.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Comment thread
nordicjm marked this conversation as resolved.
/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)>;
};
};
};
117 changes: 117 additions & 0 deletions dts/samples/matter/nrf54l15_cpuapp_ns_partitions.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)>;
};
};
Comment on lines +7 to +27
Copy link
Copy Markdown
Contributor

@nordicjm nordicjm Apr 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this shouldn't be needed either with upmerge

Copy link
Copy Markdown
Contributor Author

@ArekBalysNordic ArekBalysNordic Apr 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should I wait for the upmerge to be finalized, or merge this PR and remove it later?

Copy link
Copy Markdown
Contributor Author

@ArekBalysNordic ArekBalysNordic Apr 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will remove it in the Phase 2. Zephyr upmerge probably will be done until that, so I will be able to remove all of those things.


/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)>;
};
};
};
Loading
Loading