Skip to content

Commit 342476b

Browse files
committed
applications: nrf_desktop: Keep slot0/slot1 labels in B0 DTS layout
Add slot0_partition and slot1_partition as additional labels on the s0_partition / s1_partition so that the map works with PM. Ref: NCSDK-39474 Signed-off-by: Marcin Jelinski <marcin.jelinski@nordicsemi.no>
1 parent 6bb7b99 commit 342476b

2 files changed

Lines changed: 10 additions & 4 deletions

File tree

applications/nrf_desktop/configuration/nrf52840dk_nrf52840/memory_map_b0.dtsi

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,16 @@
2424
reg = <0x5000 DT_SIZE_K(4)>;
2525
};
2626

27-
s0_partition: partition@6000 {
27+
/* Define 'slot0_partition' and 'slot1_partition' as additional labels.
28+
* This keeps compatibility with the Partition Manager.
29+
*/
30+
slot0_partition: s0_partition: partition@6000 {
2831
compatible = "zephyr,mapped-partition";
2932
label = "b0-image-0";
3033
reg = <0x6000 DT_SIZE_K(496)>;
3134
};
3235

33-
s1_partition: partition@82000 {
36+
slot1_partition: s1_partition: partition@82000 {
3437
compatible = "zephyr,mapped-partition";
3538
label = "b0-image-1";
3639
reg = <0x82000 DT_SIZE_K(496)>;

applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/memory_map_b0.dtsi

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,16 @@
2424
reg = <0x8000 DT_SIZE_K(4)>;
2525
};
2626

27-
s0_partition: partition@9000 {
27+
/* Define 'slot0_partition' and 'slot1_partition' as additional labels.
28+
* This keeps compatibility with the Partition Manager.
29+
*/
30+
slot0_partition: s0_partition: partition@9000 {
2831
compatible = "zephyr,mapped-partition";
2932
label = "b0-image-0";
3033
reg = <0x9000 DT_SIZE_K(488)>;
3134
};
3235

33-
s1_partition: partition@83000 {
36+
slot1_partition: s1_partition: partition@83000 {
3437
compatible = "zephyr,mapped-partition";
3538
label = "b0-image-1";
3639
reg = <0x83000 DT_SIZE_K(488)>;

0 commit comments

Comments
 (0)