Skip to content

Commit 8baecc7

Browse files
maje-embrlubos
maje-emb
authored and
rlubos
committed
applications: nrf_desktop: use mapped-partition binding for memory maps
Switch from the `fixed-partitions` binding to the `zephyr,mapped-partition`. Ref: NCSDK-39353 Signed-off-by: Marcin Jelinski <marcin.jelinski@nordicsemi.no>
1 parent ee6fbdc commit 8baecc7

22 files changed

Lines changed: 108 additions & 22 deletions

File tree

‎applications/nrf_desktop/configuration/nrf52833dk_nrf52833/memory_map.dtsi‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,24 @@
88
/delete-node/ partitions;
99

1010
partitions {
11-
compatible = "fixed-partitions";
1211
#address-cells = <1>;
1312
#size-cells = <1>;
13+
ranges;
1414

1515
boot_partition: partition@0 {
16+
compatible = "zephyr,mapped-partition";
1617
label = "mcuboot";
1718
reg = <0x0 DT_SIZE_K(64)>;
1819
};
1920

2021
slot0_partition: partition@10000 {
22+
compatible = "zephyr,mapped-partition";
2123
label = "image-0";
2224
reg = <0x10000 DT_SIZE_K(440)>;
2325
};
2426

2527
storage_partition: partition@7e000 {
28+
compatible = "zephyr,mapped-partition";
2629
label = "storage";
2730
reg = <0x7e000 DT_SIZE_K(8)>;
2831
};

‎applications/nrf_desktop/configuration/nrf52833dk_nrf52833/memory_map_dongle_small.dtsi‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,24 @@
88
/delete-node/ partitions;
99

1010
partitions {
11-
compatible = "fixed-partitions";
1211
#address-cells = <1>;
1312
#size-cells = <1>;
13+
ranges;
1414

1515
boot_partition: partition@0 {
16+
compatible = "zephyr,mapped-partition";
1617
label = "mcuboot";
1718
reg = <0x0 DT_SIZE_K(52)>;
1819
};
1920

2021
slot0_partition: partition@d000 {
22+
compatible = "zephyr,mapped-partition";
2123
label = "image-0";
2224
reg = <0xd000 DT_SIZE_K(452)>;
2325
};
2426

2527
storage_partition: partition@7e000 {
28+
compatible = "zephyr,mapped-partition";
2629
label = "storage";
2730
reg = <0x7e000 DT_SIZE_K(8)>;
2831
};

‎applications/nrf_desktop/configuration/nrf52833dk_nrf52833/memory_map_release.dtsi‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,24 @@
88
/delete-node/ partitions;
99

1010
partitions {
11-
compatible = "fixed-partitions";
1211
#address-cells = <1>;
1312
#size-cells = <1>;
13+
ranges;
1414

1515
boot_partition: partition@0 {
16+
compatible = "zephyr,mapped-partition";
1617
label = "mcuboot";
1718
reg = <0x0 DT_SIZE_K(52)>;
1819
};
1920

2021
slot0_partition: partition@d000 {
22+
compatible = "zephyr,mapped-partition";
2123
label = "image-0";
2224
reg = <0xd000 DT_SIZE_K(452)>;
2325
};
2426

2527
storage_partition: partition@7e000 {
28+
compatible = "zephyr,mapped-partition";
2629
label = "storage";
2730
reg = <0x7e000 DT_SIZE_K(8)>;
2831
};

‎applications/nrf_desktop/configuration/nrf52840dk_nrf52840/memory_map_fast_pair.dtsi‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,36 @@
88
/delete-node/ partitions;
99

1010
partitions {
11-
compatible = "fixed-partitions";
1211
#address-cells = <1>;
1312
#size-cells = <1>;
13+
ranges;
1414

1515
boot_partition: partition@0 {
16+
compatible = "zephyr,mapped-partition";
1617
label = "mcuboot";
1718
reg = <0x0 DT_SIZE_K(32)>;
1819
};
1920

2021
slot0_partition: partition@8000 {
22+
compatible = "zephyr,mapped-partition";
2123
label = "image-0";
2224
reg = <0x8000 DT_SIZE_K(488)>;
2325
};
2426

2527
slot1_partition: partition@82000 {
28+
compatible = "zephyr,mapped-partition";
2629
label = "image-1";
2730
reg = <0x82000 DT_SIZE_K(488)>;
2831
};
2932

3033
bt_fast_pair_partition: partition@fc000 {
34+
compatible = "zephyr,mapped-partition";
3135
label = "fast_pair";
3236
reg = <0xfc000 DT_SIZE_K(4)>;
3337
};
3438

3539
storage_partition: partition@fd000 {
40+
compatible = "zephyr,mapped-partition";
3641
label = "storage";
3742
reg = <0xfd000 DT_SIZE_K(12)>;
3843
};

‎applications/nrf_desktop/configuration/nrf52840dk_nrf52840/memory_map_mcuboot_qspi.dtsi‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,24 @@
88
/delete-node/ partitions;
99

1010
partitions {
11-
compatible = "fixed-partitions";
1211
#address-cells = <1>;
1312
#size-cells = <1>;
13+
ranges;
1414

1515
boot_partition: partition@0 {
16+
compatible = "zephyr,mapped-partition";
1617
label = "mcuboot";
1718
reg = <0x0 DT_SIZE_K(48)>;
1819
};
1920

2021
slot0_partition: partition@c000 {
22+
compatible = "zephyr,mapped-partition";
2123
label = "image-0";
2224
reg = <0xc000 DT_SIZE_K(960)>;
2325
};
2426

2527
storage_partition: partition@fc000 {
28+
compatible = "zephyr,mapped-partition";
2629
label = "storage";
2730
reg = <0xfc000 DT_SIZE_K(16)>;
2831
};

‎applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/memory_map_fast_pair.dtsi‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,36 @@
88
/delete-node/ partitions;
99

1010
partitions {
11-
compatible = "fixed-partitions";
1211
#address-cells = <1>;
1312
#size-cells = <1>;
13+
ranges;
1414

1515
boot_partition: partition@0 {
16+
compatible = "zephyr,mapped-partition";
1617
label = "mcuboot";
1718
reg = <0x0 DT_SIZE_K(32)>;
1819
};
1920

2021
slot0_partition: partition@8000 {
22+
compatible = "zephyr,mapped-partition";
2123
label = "image-0";
2224
reg = <0x8000 DT_SIZE_K(488)>;
2325
};
2426

2527
slot1_partition: partition@82000 {
28+
compatible = "zephyr,mapped-partition";
2629
label = "image-1";
2730
reg = <0x82000 DT_SIZE_K(488)>;
2831
};
2932

3033
bt_fast_pair_partition: partition@fc000 {
34+
compatible = "zephyr,mapped-partition";
3135
label = "fast_pair";
3236
reg = <0xfc000 DT_SIZE_K(4)>;
3337
};
3438

3539
storage_partition: partition@fd000 {
40+
compatible = "zephyr,mapped-partition";
3641
label = "storage";
3742
reg = <0xfd000 DT_SIZE_K(12)>;
3843
};

‎applications/nrf_desktop/configuration/nrf52kbd_nrf52832/memory_map_release_fast_pair.dtsi‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,36 @@
88
/delete-node/ partitions;
99

1010
partitions {
11-
compatible = "fixed-partitions";
1211
#address-cells = <1>;
1312
#size-cells = <1>;
13+
ranges;
1414

1515
boot_partition: partition@0 {
16+
compatible = "zephyr,mapped-partition";
1617
label = "mcuboot";
1718
reg = <0x0 DT_SIZE_K(24)>;
1819
};
1920

2021
slot0_partition: partition@6000 {
22+
compatible = "zephyr,mapped-partition";
2123
label = "image-0";
2224
reg = <0x6000 DT_SIZE_K(236)>;
2325
};
2426

2527
slot1_partition: partition@41000 {
28+
compatible = "zephyr,mapped-partition";
2629
label = "image-1";
2730
reg = <0x41000 DT_SIZE_K(236)>;
2831
};
2932

3033
bt_fast_pair_partition: partition@7c000 {
34+
compatible = "zephyr,mapped-partition";
3135
label = "fast_pair";
3236
reg = <0x7c000 DT_SIZE_K(4)>;
3337
};
3438

3539
storage_partition: partition@7d000 {
40+
compatible = "zephyr,mapped-partition";
3641
label = "storage";
3742
reg = <0x7d000 DT_SIZE_K(12)>;
3843
};

‎applications/nrf_desktop/configuration/nrf54l15dk_nrf54l05_cpuapp/memory_map.dtsi‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,18 @@
1111
/delete-node/ partitions;
1212

1313
partitions {
14-
compatible = "fixed-partitions";
1514
#address-cells = <1>;
1615
#size-cells = <1>;
16+
ranges;
1717

1818
slot0_partition: partition@0 {
19+
compatible = "zephyr,mapped-partition";
1920
label = "image-0";
2021
reg = <0x0 DT_SIZE_K(484)>;
2122
};
2223

2324
storage_partition: partition@79000 {
25+
compatible = "zephyr,mapped-partition";
2426
label = "storage";
2527
reg = <0x79000 DT_SIZE_K(16)>;
2628
};

‎applications/nrf_desktop/configuration/nrf54l15dk_nrf54l05_cpuapp/memory_map_release.dtsi‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,30 @@
1111
/delete-node/ partitions;
1212

1313
partitions {
14-
compatible = "fixed-partitions";
1514
#address-cells = <1>;
1615
#size-cells = <1>;
16+
ranges;
1717

1818
boot_partition: partition@0 {
19+
compatible = "zephyr,mapped-partition";
1920
label = "mcuboot";
2021
reg = <0x0 DT_SIZE_K(28)>;
2122
};
2223

2324
slot0_partition: partition@7000 {
25+
compatible = "zephyr,mapped-partition";
2426
label = "image-0";
2527
reg = <0x7000 DT_SIZE_K(228)>;
2628
};
2729

2830
slot1_partition: partition@40000 {
31+
compatible = "zephyr,mapped-partition";
2932
label = "image-1";
3033
reg = <0x40000 DT_SIZE_K(228)>;
3134
};
3235

3336
storage_partition: partition@79000 {
37+
compatible = "zephyr,mapped-partition";
3438
label = "storage";
3539
reg = <0x79000 DT_SIZE_K(16)>;
3640
};

‎applications/nrf_desktop/configuration/nrf54l15dk_nrf54l05_cpuapp/memory_map_release_fast_pair.dtsi‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,31 +11,36 @@
1111
/delete-node/ partitions;
1212

1313
partitions {
14-
compatible = "fixed-partitions";
1514
#address-cells = <1>;
1615
#size-cells = <1>;
16+
ranges;
1717

1818
boot_partition: partition@0 {
19+
compatible = "zephyr,mapped-partition";
1920
label = "mcuboot";
2021
reg = <0x0 DT_SIZE_K(28)>;
2122
};
2223

2324
slot0_partition: partition@7000 {
25+
compatible = "zephyr,mapped-partition";
2426
label = "image-0";
2527
reg = <0x7000 DT_SIZE_K(224)>;
2628
};
2729

2830
slot1_partition: partition@3f000 {
31+
compatible = "zephyr,mapped-partition";
2932
label = "image-1";
3033
reg = <0x3f000 DT_SIZE_K(224)>;
3134
};
3235

3336
bt_fast_pair_partition: partition@77000 {
37+
compatible = "zephyr,mapped-partition";
3438
label = "fast_pair";
3539
reg = <0x77000 DT_SIZE_K(4)>;
3640
};
3741

3842
storage_partition: partition@78000 {
43+
compatible = "zephyr,mapped-partition";
3944
label = "storage";
4045
reg = <0x78000 DT_SIZE_K(20)>;
4146
};

0 commit comments

Comments
 (0)