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 <jamie.mccrae@nordicsemi.no>
This commit is contained in:
parent
002838ab9e
commit
124a803fc4
13 changed files with 52 additions and 237 deletions
|
@ -20,41 +20,5 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
&cpuapp_rram {
|
/* Include default memory partition configuration file */
|
||||||
partitions {
|
#include <nordic/nrf54l15_partition.dtsi>
|
||||||
compatible = "fixed-partitions";
|
|
||||||
#address-cells = <1>;
|
|
||||||
#size-cells = <1>;
|
|
||||||
|
|
||||||
boot_partition: partition@0 {
|
|
||||||
label = "mcuboot";
|
|
||||||
reg = <0x0 DT_SIZE_K(64)>;
|
|
||||||
};
|
|
||||||
|
|
||||||
slot0_partition: partition@10000 {
|
|
||||||
label = "image-0";
|
|
||||||
reg = <0x10000 DT_SIZE_K(324)>;
|
|
||||||
};
|
|
||||||
|
|
||||||
slot0_ns_partition: partition@61000 {
|
|
||||||
label = "image-0-nonsecure";
|
|
||||||
reg = <0x61000 DT_SIZE_K(324)>;
|
|
||||||
};
|
|
||||||
|
|
||||||
slot1_partition: partition@b2000 {
|
|
||||||
label = "image-1";
|
|
||||||
reg = <0xb2000 DT_SIZE_K(324)>;
|
|
||||||
};
|
|
||||||
|
|
||||||
slot1_ns_partition: partition@103000 {
|
|
||||||
label = "image-1-nonsecure";
|
|
||||||
reg = <0x103000 DT_SIZE_K(324)>;
|
|
||||||
};
|
|
||||||
|
|
||||||
/* 32k from 0x154000 to 0x15bfff reserved for TF-M partitions */
|
|
||||||
storage_partition: partition@15c000 {
|
|
||||||
label = "storage";
|
|
||||||
reg = <0x15c000 DT_SIZE_K(36)>;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
|
@ -11,7 +11,7 @@ toolchain:
|
||||||
- zephyr
|
- zephyr
|
||||||
sysbuild: true
|
sysbuild: true
|
||||||
ram: 188
|
ram: 188
|
||||||
flash: 324
|
flash: 1428
|
||||||
supported:
|
supported:
|
||||||
- adc
|
- adc
|
||||||
- counter
|
- counter
|
||||||
|
|
|
@ -20,41 +20,5 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
&cpuapp_rram {
|
/* Include default memory partition configuration file */
|
||||||
partitions {
|
#include <nordic/nrf54l15_partition.dtsi>
|
||||||
compatible = "fixed-partitions";
|
|
||||||
#address-cells = <1>;
|
|
||||||
#size-cells = <1>;
|
|
||||||
|
|
||||||
boot_partition: partition@0 {
|
|
||||||
label = "mcuboot";
|
|
||||||
reg = <0x0 DT_SIZE_K(64)>;
|
|
||||||
};
|
|
||||||
|
|
||||||
slot0_partition: partition@10000 {
|
|
||||||
label = "image-0";
|
|
||||||
reg = <0x10000 DT_SIZE_K(324)>;
|
|
||||||
};
|
|
||||||
|
|
||||||
slot0_ns_partition: partition@61000 {
|
|
||||||
label = "image-0-nonsecure";
|
|
||||||
reg = <0x61000 DT_SIZE_K(324)>;
|
|
||||||
};
|
|
||||||
|
|
||||||
slot1_partition: partition@b2000 {
|
|
||||||
label = "image-1";
|
|
||||||
reg = <0xb2000 DT_SIZE_K(324)>;
|
|
||||||
};
|
|
||||||
|
|
||||||
slot1_ns_partition: partition@103000 {
|
|
||||||
label = "image-1-nonsecure";
|
|
||||||
reg = <0x103000 DT_SIZE_K(324)>;
|
|
||||||
};
|
|
||||||
|
|
||||||
/* 32k from 0x154000 to 0x15bfff reserved for TF-M partitions */
|
|
||||||
storage_partition: partition@15c000 {
|
|
||||||
label = "storage";
|
|
||||||
reg = <0x15c000 DT_SIZE_K(36)>;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
|
@ -11,7 +11,7 @@ toolchain:
|
||||||
- zephyr
|
- zephyr
|
||||||
sysbuild: true
|
sysbuild: true
|
||||||
ram: 188
|
ram: 188
|
||||||
flash: 324
|
flash: 1428
|
||||||
supported:
|
supported:
|
||||||
- adc
|
- adc
|
||||||
- counter
|
- counter
|
||||||
|
|
|
@ -19,42 +19,5 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
&cpuapp_rram {
|
/* Include default memory partition configuration file */
|
||||||
partitions {
|
#include <nordic/nrf54l15_partition.dtsi>
|
||||||
compatible = "fixed-partitions";
|
|
||||||
#address-cells = <1>;
|
|
||||||
#size-cells = <1>;
|
|
||||||
|
|
||||||
boot_partition: partition@0 {
|
|
||||||
label = "mcuboot";
|
|
||||||
reg = <0x0 DT_SIZE_K(64)>;
|
|
||||||
};
|
|
||||||
|
|
||||||
slot0_partition: partition@10000 {
|
|
||||||
label = "image-0";
|
|
||||||
reg = <0x10000 DT_SIZE_K(324)>;
|
|
||||||
};
|
|
||||||
|
|
||||||
slot0_ns_partition: partition@61000 {
|
|
||||||
label = "image-0-nonsecure";
|
|
||||||
reg = <0x61000 DT_SIZE_K(324)>;
|
|
||||||
};
|
|
||||||
|
|
||||||
slot1_partition: partition@b2000 {
|
|
||||||
label = "image-1";
|
|
||||||
reg = <0xb2000 DT_SIZE_K(324)>;
|
|
||||||
};
|
|
||||||
|
|
||||||
slot1_ns_partition: partition@103000 {
|
|
||||||
label = "image-1-nonsecure";
|
|
||||||
reg = <0x103000 DT_SIZE_K(324)>;
|
|
||||||
};
|
|
||||||
|
|
||||||
/* 32k from 0x154000 to 0x15bfff reserved for TF-M partitions */
|
|
||||||
|
|
||||||
storage_partition: partition@15c000 {
|
|
||||||
label = "storage";
|
|
||||||
reg = <0x15c000 DT_SIZE_K(36)>;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
|
@ -10,7 +10,7 @@ toolchain:
|
||||||
- zephyr
|
- zephyr
|
||||||
sysbuild: true
|
sysbuild: true
|
||||||
ram: 188
|
ram: 188
|
||||||
flash: 324
|
flash: 1428
|
||||||
supported:
|
supported:
|
||||||
- adc
|
- adc
|
||||||
- counter
|
- counter
|
||||||
|
|
|
@ -19,41 +19,5 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
&cpuapp_rram {
|
/* Include default memory partition configuration file */
|
||||||
partitions {
|
#include <nordic/nrf54l15_partition.dtsi>
|
||||||
compatible = "fixed-partitions";
|
|
||||||
#address-cells = <1>;
|
|
||||||
#size-cells = <1>;
|
|
||||||
|
|
||||||
boot_partition: partition@0 {
|
|
||||||
label = "mcuboot";
|
|
||||||
reg = <0x0 DT_SIZE_K(64)>;
|
|
||||||
};
|
|
||||||
|
|
||||||
slot0_partition: partition@10000 {
|
|
||||||
label = "image-0";
|
|
||||||
reg = <0x10000 DT_SIZE_K(324)>;
|
|
||||||
};
|
|
||||||
|
|
||||||
slot0_ns_partition: partition@61000 {
|
|
||||||
label = "image-0-nonsecure";
|
|
||||||
reg = <0x61000 DT_SIZE_K(324)>;
|
|
||||||
};
|
|
||||||
|
|
||||||
slot1_partition: partition@b2000 {
|
|
||||||
label = "image-1";
|
|
||||||
reg = <0xb2000 DT_SIZE_K(324)>;
|
|
||||||
};
|
|
||||||
|
|
||||||
slot1_ns_partition: partition@103000 {
|
|
||||||
label = "image-1-nonsecure";
|
|
||||||
reg = <0x103000 DT_SIZE_K(324)>;
|
|
||||||
};
|
|
||||||
|
|
||||||
/* 32k from 0x154000 to 0x15bfff reserved for TF-M partitions */
|
|
||||||
storage_partition: partition@15c000 {
|
|
||||||
label = "storage";
|
|
||||||
reg = <0x15c000 DT_SIZE_K(36)>;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
|
@ -10,7 +10,7 @@ toolchain:
|
||||||
- zephyr
|
- zephyr
|
||||||
sysbuild: true
|
sysbuild: true
|
||||||
ram: 188
|
ram: 188
|
||||||
flash: 324
|
flash: 1428
|
||||||
supported:
|
supported:
|
||||||
- adc
|
- adc
|
||||||
- counter
|
- counter
|
||||||
|
|
|
@ -21,41 +21,5 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
&cpuapp_rram {
|
/* Include default memory partition configuration file */
|
||||||
partitions {
|
#include <nordic/nrf54l15_partition.dtsi>
|
||||||
compatible = "fixed-partitions";
|
|
||||||
#address-cells = <1>;
|
|
||||||
#size-cells = <1>;
|
|
||||||
|
|
||||||
boot_partition: partition@0 {
|
|
||||||
label = "mcuboot";
|
|
||||||
reg = <0x0 DT_SIZE_K(64)>;
|
|
||||||
};
|
|
||||||
|
|
||||||
slot0_partition: partition@10000 {
|
|
||||||
label = "image-0";
|
|
||||||
reg = <0x10000 DT_SIZE_K(324)>;
|
|
||||||
};
|
|
||||||
|
|
||||||
slot0_ns_partition: partition@61000 {
|
|
||||||
label = "image-0-nonsecure";
|
|
||||||
reg = <0x61000 DT_SIZE_K(324)>;
|
|
||||||
};
|
|
||||||
|
|
||||||
slot1_partition: partition@b2000 {
|
|
||||||
label = "image-1";
|
|
||||||
reg = <0xb2000 DT_SIZE_K(324)>;
|
|
||||||
};
|
|
||||||
|
|
||||||
slot1_ns_partition: partition@103000 {
|
|
||||||
label = "image-1-nonsecure";
|
|
||||||
reg = <0x103000 DT_SIZE_K(324)>;
|
|
||||||
};
|
|
||||||
|
|
||||||
/* 32k from 0x154000 to 0x15bfff reserved for TF-M partitions */
|
|
||||||
storage_partition: partition@15c000 {
|
|
||||||
label = "storage";
|
|
||||||
reg = <0x15c000 DT_SIZE_K(36)>;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
|
@ -12,7 +12,7 @@ toolchain:
|
||||||
- zephyr
|
- zephyr
|
||||||
sysbuild: true
|
sysbuild: true
|
||||||
ram: 188
|
ram: 188
|
||||||
flash: 324
|
flash: 1428
|
||||||
supported:
|
supported:
|
||||||
- adc
|
- adc
|
||||||
- counter
|
- counter
|
||||||
|
|
|
@ -26,46 +26,6 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
&cpuapp_rram {
|
|
||||||
partitions {
|
|
||||||
compatible = "fixed-partitions";
|
|
||||||
|
|
||||||
#address-cells = <1>;
|
|
||||||
#size-cells = <1>;
|
|
||||||
|
|
||||||
boot_partition: partition@0 {
|
|
||||||
label = "mcuboot";
|
|
||||||
reg = <0x0 DT_SIZE_K(64)>;
|
|
||||||
};
|
|
||||||
|
|
||||||
slot0_partition: partition@10000 {
|
|
||||||
label = "image-0";
|
|
||||||
reg = <0x10000 DT_SIZE_K(324)>;
|
|
||||||
};
|
|
||||||
|
|
||||||
slot0_ns_partition: partition@61000 {
|
|
||||||
label = "image-0-nonsecure";
|
|
||||||
reg = <0x61000 DT_SIZE_K(324)>;
|
|
||||||
};
|
|
||||||
|
|
||||||
slot1_partition: partition@b2000 {
|
|
||||||
label = "image-1";
|
|
||||||
reg = <0xb2000 DT_SIZE_K(324)>;
|
|
||||||
};
|
|
||||||
|
|
||||||
slot1_ns_partition: partition@103000 {
|
|
||||||
label = "image-1-nonsecure";
|
|
||||||
reg = <0x103000 DT_SIZE_K(324)>;
|
|
||||||
};
|
|
||||||
|
|
||||||
/* 32k from 0x154000 to 0x15bfff reserved for TF-M partitions */
|
|
||||||
storage_partition: partition@15c000 {
|
|
||||||
label = "storage";
|
|
||||||
reg = <0x15c000 DT_SIZE_K(36)>;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
&cpuapp_sram {
|
&cpuapp_sram {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
@ -172,3 +132,6 @@
|
||||||
&adc {
|
&adc {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/* Include default memory partition configuration file */
|
||||||
|
#include <nordic/nrf54l15_partition.dtsi>
|
||||||
|
|
|
@ -10,7 +10,7 @@ toolchain:
|
||||||
- zephyr
|
- zephyr
|
||||||
sysbuild: true
|
sysbuild: true
|
||||||
ram: 188
|
ram: 188
|
||||||
flash: 324
|
flash: 1428
|
||||||
supported:
|
supported:
|
||||||
- adc
|
- adc
|
||||||
- counter
|
- counter
|
||||||
|
|
33
dts/vendor/nordic/nrf54l15_partition.dtsi
vendored
Normal file
33
dts/vendor/nordic/nrf54l15_partition.dtsi
vendored
Normal file
|
@ -0,0 +1,33 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2025 Nordic Semiconductor ASA
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: Apache-2.0
|
||||||
|
*/
|
||||||
|
|
||||||
|
&cpuapp_rram {
|
||||||
|
partitions {
|
||||||
|
compatible = "fixed-partitions";
|
||||||
|
#address-cells = <1>;
|
||||||
|
#size-cells = <1>;
|
||||||
|
|
||||||
|
boot_partition: partition@0 {
|
||||||
|
label = "mcuboot";
|
||||||
|
reg = <0x0 DT_SIZE_K(64)>;
|
||||||
|
};
|
||||||
|
|
||||||
|
slot0_partition: partition@10000 {
|
||||||
|
label = "image-0";
|
||||||
|
reg = <0x10000 DT_SIZE_K(664)>;
|
||||||
|
};
|
||||||
|
|
||||||
|
slot1_partition: partition@b6000 {
|
||||||
|
label = "image-1";
|
||||||
|
reg = <0xb6000 DT_SIZE_K(664)>;
|
||||||
|
};
|
||||||
|
|
||||||
|
storage_partition: partition@15c000 {
|
||||||
|
label = "storage";
|
||||||
|
reg = <0x15c000 DT_SIZE_K(36)>;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
Loading…
Add table
Add a link
Reference in a new issue