Skip to content

Commit 9c5abe3

Browse files
nordicjmnordicjm
committed
[nrf fromtree] boards: nordic: nrf54l15: Change to use common dts partitioning file
Adds a common vendor dts file specifying the default partition layout for nRF54L15-based cpuapp board targets and updates boards to use this common file. This also drops the secure/non-secure split in the partitioning as this was reducing NVM storage that is not used by this board target and fixes the wrong flash field in twister yaml files Signed-off-by: Jamie McCrae <[email protected]> (cherry picked from commit 124a803)
1 parent 6e4f3d9 commit 9c5abe3

13 files changed

+52
-237
lines changed

‎boards/ezurio/bl54l15_dvk/bl54l15_dvk_nrf54l15_cpuapp.dts‎

Lines changed: 2 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -20,41 +20,5 @@
2020
};
2121
};
2222

23-
&cpuapp_rram {
24-
partitions {
25-
compatible = "fixed-partitions";
26-
#address-cells = <1>;
27-
#size-cells = <1>;
28-
29-
boot_partition: partition@0 {
30-
label = "mcuboot";
31-
reg = <0x0 DT_SIZE_K(64)>;
32-
};
33-
34-
slot0_partition: partition@10000 {
35-
label = "image-0";
36-
reg = <0x10000 DT_SIZE_K(324)>;
37-
};
38-
39-
slot0_ns_partition: partition@61000 {
40-
label = "image-0-nonsecure";
41-
reg = <0x61000 DT_SIZE_K(324)>;
42-
};
43-
44-
slot1_partition: partition@b2000 {
45-
label = "image-1";
46-
reg = <0xb2000 DT_SIZE_K(324)>;
47-
};
48-
49-
slot1_ns_partition: partition@103000 {
50-
label = "image-1-nonsecure";
51-
reg = <0x103000 DT_SIZE_K(324)>;
52-
};
53-
54-
/* 32k from 0x154000 to 0x15bfff reserved for TF-M partitions */
55-
storage_partition: partition@15c000 {
56-
label = "storage";
57-
reg = <0x15c000 DT_SIZE_K(36)>;
58-
};
59-
};
60-
};
23+
/* Include default memory partition configuration file */
24+
#include <nordic/nrf54l15_partition.dtsi>

‎boards/ezurio/bl54l15_dvk/bl54l15_dvk_nrf54l15_cpuapp.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ toolchain:
1111
- zephyr
1212
sysbuild: true
1313
ram: 188
14-
flash: 324
14+
flash: 1428
1515
supported:
1616
- adc
1717
- counter

‎boards/ezurio/bl54l15u_dvk/bl54l15u_dvk_nrf54l15_cpuapp.dts‎

Lines changed: 2 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -20,41 +20,5 @@
2020
};
2121
};
2222

23-
&cpuapp_rram {
24-
partitions {
25-
compatible = "fixed-partitions";
26-
#address-cells = <1>;
27-
#size-cells = <1>;
28-
29-
boot_partition: partition@0 {
30-
label = "mcuboot";
31-
reg = <0x0 DT_SIZE_K(64)>;
32-
};
33-
34-
slot0_partition: partition@10000 {
35-
label = "image-0";
36-
reg = <0x10000 DT_SIZE_K(324)>;
37-
};
38-
39-
slot0_ns_partition: partition@61000 {
40-
label = "image-0-nonsecure";
41-
reg = <0x61000 DT_SIZE_K(324)>;
42-
};
43-
44-
slot1_partition: partition@b2000 {
45-
label = "image-1";
46-
reg = <0xb2000 DT_SIZE_K(324)>;
47-
};
48-
49-
slot1_ns_partition: partition@103000 {
50-
label = "image-1-nonsecure";
51-
reg = <0x103000 DT_SIZE_K(324)>;
52-
};
53-
54-
/* 32k from 0x154000 to 0x15bfff reserved for TF-M partitions */
55-
storage_partition: partition@15c000 {
56-
label = "storage";
57-
reg = <0x15c000 DT_SIZE_K(36)>;
58-
};
59-
};
60-
};
23+
/* Include default memory partition configuration file */
24+
#include <nordic/nrf54l15_partition.dtsi>

‎boards/ezurio/bl54l15u_dvk/bl54l15u_dvk_nrf54l15_cpuapp.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ toolchain:
1111
- zephyr
1212
sysbuild: true
1313
ram: 188
14-
flash: 324
14+
flash: 1428
1515
supported:
1616
- adc
1717
- counter

‎boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp.dts‎

Lines changed: 2 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -19,42 +19,5 @@
1919
};
2020
};
2121

22-
&cpuapp_rram {
23-
partitions {
24-
compatible = "fixed-partitions";
25-
#address-cells = <1>;
26-
#size-cells = <1>;
27-
28-
boot_partition: partition@0 {
29-
label = "mcuboot";
30-
reg = <0x0 DT_SIZE_K(64)>;
31-
};
32-
33-
slot0_partition: partition@10000 {
34-
label = "image-0";
35-
reg = <0x10000 DT_SIZE_K(324)>;
36-
};
37-
38-
slot0_ns_partition: partition@61000 {
39-
label = "image-0-nonsecure";
40-
reg = <0x61000 DT_SIZE_K(324)>;
41-
};
42-
43-
slot1_partition: partition@b2000 {
44-
label = "image-1";
45-
reg = <0xb2000 DT_SIZE_K(324)>;
46-
};
47-
48-
slot1_ns_partition: partition@103000 {
49-
label = "image-1-nonsecure";
50-
reg = <0x103000 DT_SIZE_K(324)>;
51-
};
52-
53-
/* 32k from 0x154000 to 0x15bfff reserved for TF-M partitions */
54-
55-
storage_partition: partition@15c000 {
56-
label = "storage";
57-
reg = <0x15c000 DT_SIZE_K(36)>;
58-
};
59-
};
60-
};
22+
/* Include default memory partition configuration file */
23+
#include <nordic/nrf54l15_partition.dtsi>

‎boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ toolchain:
1010
- zephyr
1111
sysbuild: true
1212
ram: 188
13-
flash: 324
13+
flash: 1428
1414
supported:
1515
- adc
1616
- counter

‎boards/panasonic/panb511evb/panb511evb_nrf54l15_cpuapp.dts‎

Lines changed: 2 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -19,41 +19,5 @@
1919
};
2020
};
2121

22-
&cpuapp_rram {
23-
partitions {
24-
compatible = "fixed-partitions";
25-
#address-cells = <1>;
26-
#size-cells = <1>;
27-
28-
boot_partition: partition@0 {
29-
label = "mcuboot";
30-
reg = <0x0 DT_SIZE_K(64)>;
31-
};
32-
33-
slot0_partition: partition@10000 {
34-
label = "image-0";
35-
reg = <0x10000 DT_SIZE_K(324)>;
36-
};
37-
38-
slot0_ns_partition: partition@61000 {
39-
label = "image-0-nonsecure";
40-
reg = <0x61000 DT_SIZE_K(324)>;
41-
};
42-
43-
slot1_partition: partition@b2000 {
44-
label = "image-1";
45-
reg = <0xb2000 DT_SIZE_K(324)>;
46-
};
47-
48-
slot1_ns_partition: partition@103000 {
49-
label = "image-1-nonsecure";
50-
reg = <0x103000 DT_SIZE_K(324)>;
51-
};
52-
53-
/* 32k from 0x154000 to 0x15bfff reserved for TF-M partitions */
54-
storage_partition: partition@15c000 {
55-
label = "storage";
56-
reg = <0x15c000 DT_SIZE_K(36)>;
57-
};
58-
};
59-
};
22+
/* Include default memory partition configuration file */
23+
#include <nordic/nrf54l15_partition.dtsi>

‎boards/panasonic/panb511evb/panb511evb_nrf54l15_cpuapp.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ toolchain:
1010
- zephyr
1111
sysbuild: true
1212
ram: 188
13-
flash: 324
13+
flash: 1428
1414
supported:
1515
- adc
1616
- counter

‎boards/raytac/an54l15q_db/raytac_an54l15q_db_nrf54l15_cpuapp.dts‎

Lines changed: 2 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -21,41 +21,5 @@
2121
};
2222
};
2323

24-
&cpuapp_rram {
25-
partitions {
26-
compatible = "fixed-partitions";
27-
#address-cells = <1>;
28-
#size-cells = <1>;
29-
30-
boot_partition: partition@0 {
31-
label = "mcuboot";
32-
reg = <0x0 DT_SIZE_K(64)>;
33-
};
34-
35-
slot0_partition: partition@10000 {
36-
label = "image-0";
37-
reg = <0x10000 DT_SIZE_K(324)>;
38-
};
39-
40-
slot0_ns_partition: partition@61000 {
41-
label = "image-0-nonsecure";
42-
reg = <0x61000 DT_SIZE_K(324)>;
43-
};
44-
45-
slot1_partition: partition@b2000 {
46-
label = "image-1";
47-
reg = <0xb2000 DT_SIZE_K(324)>;
48-
};
49-
50-
slot1_ns_partition: partition@103000 {
51-
label = "image-1-nonsecure";
52-
reg = <0x103000 DT_SIZE_K(324)>;
53-
};
54-
55-
/* 32k from 0x154000 to 0x15bfff reserved for TF-M partitions */
56-
storage_partition: partition@15c000 {
57-
label = "storage";
58-
reg = <0x15c000 DT_SIZE_K(36)>;
59-
};
60-
};
61-
};
24+
/* Include default memory partition configuration file */
25+
#include <nordic/nrf54l15_partition.dtsi>

‎boards/raytac/an54l15q_db/raytac_an54l15q_db_nrf54l15_cpuapp.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ toolchain:
1212
- zephyr
1313
sysbuild: true
1414
ram: 188
15-
flash: 324
15+
flash: 1428
1616
supported:
1717
- adc
1818
- counter

0 commit comments

Comments
 (0)