From 89e62340896dc909df2c04a17c1a03cf26924713 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Tue, 17 Jun 2025 07:33:54 +0100 Subject: [PATCH 01/10] [nrf fromtree] dts: vendor: nordic: nrf54l10: Fix wrong size of NVM Fixes the NVM size going beyond what the chip supports Signed-off-by: Jamie McCrae (cherry picked from commit 0f0c80e93120468cccae8679bb7d0c76c986e1a3) --- dts/vendor/nordic/nrf54l10.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dts/vendor/nordic/nrf54l10.dtsi b/dts/vendor/nordic/nrf54l10.dtsi index a515fbb42f5..800c4081f28 100644 --- a/dts/vendor/nordic/nrf54l10.dtsi +++ b/dts/vendor/nordic/nrf54l10.dtsi @@ -25,14 +25,14 @@ }; &cpuapp_rram { - reg = <0x0 DT_SIZE_K(960)>; + reg = <0x0 DT_SIZE_K(950)>; }; -/* 960 + 62 = 1022KB */ +/* 950 + 62 = 1012KB */ &rram_controller { - cpuflpr_rram: rram@f0000 { + cpuflpr_rram: rram@ed800 { compatible = "soc-nv-flash"; - reg = <0xf0000 DT_SIZE_K(62)>; + reg = <0xed800 DT_SIZE_K(62)>; erase-block-size = <4096>; write-block-size = <16>; }; From 0b78cd8c1e28a43318f86910edc574c75fe984e2 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Tue, 17 Jun 2025 07:47:16 +0100 Subject: [PATCH 02/10] [nrf fromtree] boards: nordic: nrf54l10: Change to use common dts partitioning file Adds a common vendor dts file specifying the default partition layout for nRF54L10-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 (cherry picked from commit 9dc6040fcdf2c4c98add78e618afa7afa808732e) --- .../bl54l15_dvk_nrf54l10_cpuapp.dts | 48 +------------------ .../bl54l15_dvk_nrf54l10_cpuapp.yaml | 2 +- .../nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp.dts | 48 +------------------ .../nrf54l15dk_nrf54l10_cpuapp.yaml | 2 +- dts/vendor/nordic/nrf54l10_partition.dtsi | 38 +++++++++++++++ 5 files changed, 44 insertions(+), 94 deletions(-) create mode 100644 dts/vendor/nordic/nrf54l10_partition.dtsi diff --git a/boards/ezurio/bl54l15_dvk/bl54l15_dvk_nrf54l10_cpuapp.dts b/boards/ezurio/bl54l15_dvk/bl54l15_dvk_nrf54l10_cpuapp.dts index 3d9336bbeab..0654c4139c5 100644 --- a/boards/ezurio/bl54l15_dvk/bl54l15_dvk_nrf54l10_cpuapp.dts +++ b/boards/ezurio/bl54l15_dvk/bl54l15_dvk_nrf54l10_cpuapp.dts @@ -26,49 +26,5 @@ ranges = <0x0 0x20000000 DT_SIZE_K(192)>; }; -&cpuapp_rram { - reg = <0x0 DT_SIZE_K(1022)>; -}; - -/* These partition sizes assume no FLPR area in RRAM */ -&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(224)>; - }; - - slot0_ns_partition: partition@48000 { - label = "image-0-nonsecure"; - reg = <0x48000 DT_SIZE_K(224)>; - }; - - slot1_partition: partition@80000 { - label = "image-1"; - reg = <0x80000 DT_SIZE_K(224)>; - }; - - slot1_ns_partition: partition@b8000 { - label = "image-1-nonsecure"; - reg = <0xb8000 DT_SIZE_K(224)>; - }; - - /* 32K from 0xf0000 to 0xf7fff reserved for TF-M partitions */ - - storage_partition: partition@f8000 { - label = "storage"; - reg = <0xf8000 DT_SIZE_K(28)>; - }; - - /* 2K from 0xff000 to 0xff7ff unused */ - }; -}; +/* Include default memory partition configuration file */ +#include diff --git a/boards/ezurio/bl54l15_dvk/bl54l15_dvk_nrf54l10_cpuapp.yaml b/boards/ezurio/bl54l15_dvk/bl54l15_dvk_nrf54l10_cpuapp.yaml index 0a53875b749..13bdefd1b7e 100644 --- a/boards/ezurio/bl54l15_dvk/bl54l15_dvk_nrf54l10_cpuapp.yaml +++ b/boards/ezurio/bl54l15_dvk/bl54l15_dvk_nrf54l10_cpuapp.yaml @@ -11,7 +11,7 @@ toolchain: - zephyr sysbuild: true ram: 192 -flash: 230 +flash: 1012 supported: - adc - counter diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp.dts b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp.dts index 020fdd16af2..e3ee6b5434f 100644 --- a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp.dts +++ b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp.dts @@ -25,49 +25,5 @@ ranges = <0x0 0x20000000 DT_SIZE_K(192)>; }; -&cpuapp_rram { - reg = <0x0 DT_SIZE_K(1022)>; -}; - -/* These partition sizes assume no FLPR area in RRAM */ -&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(224)>; - }; - - slot0_ns_partition: partition@48000 { - label = "image-0-nonsecure"; - reg = <0x48000 DT_SIZE_K(224)>; - }; - - slot1_partition: partition@80000 { - label = "image-1"; - reg = <0x80000 DT_SIZE_K(224)>; - }; - - slot1_ns_partition: partition@b8000 { - label = "image-1-nonsecure"; - reg = <0xb8000 DT_SIZE_K(224)>; - }; - - /* 32K from 0xf0000 to 0xf7fff reserved for TF-M partitions */ - - storage_partition: partition@f8000 { - label = "storage"; - reg = <0xf8000 DT_SIZE_K(28)>; - }; - - /* 2K from 0xff000 to 0xff7ff unused */ - }; -}; +/* Include default memory partition configuration file */ +#include diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp.yaml b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp.yaml index d56468281ac..0be5ece7d0e 100644 --- a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp.yaml +++ b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp.yaml @@ -10,7 +10,7 @@ toolchain: - zephyr sysbuild: true ram: 192 -flash: 230 +flash: 1012 supported: - adc - counter diff --git a/dts/vendor/nordic/nrf54l10_partition.dtsi b/dts/vendor/nordic/nrf54l10_partition.dtsi new file mode 100644 index 00000000000..e73b1c5f0e3 --- /dev/null +++ b/dts/vendor/nordic/nrf54l10_partition.dtsi @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2025 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: Apache-2.0 + */ + +&cpuapp_rram { + reg = <0x0 DT_SIZE_K(1012)>; +}; + +/* These partition sizes assume no FLPR area in RRAM */ +&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(456)>; + }; + + slot1_partition: partition@82000 { + label = "image-1"; + reg = <0x82000 DT_SIZE_K(456)>; + }; + + storage_partition: partition@f4000 { + label = "storage"; + reg = <0xf4000 DT_SIZE_K(36)>; + }; + }; +}; From 38a1ec6b1f76978982170cf7f56e1a22c6056eb5 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Tue, 17 Jun 2025 08:54:10 +0100 Subject: [PATCH 03/10] [nrf fromtree] boards: nordic: nrf54l10_cpuapp_ns: Add workaround for partitions Adds a workaround for partitions on nrf54l10 non-secure devices to prevent build issues, this needs to be fixed properly when a TF-M update is done which sets the partition sizes properly Signed-off-by: Jamie McCrae (cherry picked from commit 002838ab9ef526c882225504bda0ef86ff577455) --- boards/ezurio/bl54l15_dvk/bl54l15_dvk_nrf54l10_cpuapp_ns.dts | 3 +++ boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp_ns.dts | 3 +++ 2 files changed, 6 insertions(+) diff --git a/boards/ezurio/bl54l15_dvk/bl54l15_dvk_nrf54l10_cpuapp_ns.dts b/boards/ezurio/bl54l15_dvk/bl54l15_dvk_nrf54l10_cpuapp_ns.dts index 02d900390cc..39a986ae2b6 100644 --- a/boards/ezurio/bl54l15_dvk/bl54l15_dvk_nrf54l10_cpuapp_ns.dts +++ b/boards/ezurio/bl54l15_dvk/bl54l15_dvk_nrf54l10_cpuapp_ns.dts @@ -59,6 +59,9 @@ }; &cpuapp_rram { + /* TODO: revert this hack when TF-M update is available that fixes partition sizes */ + reg = <0x0 DT_SIZE_K(1022)>; + partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp_ns.dts b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp_ns.dts index f1aa851ed2d..cd644d845d5 100644 --- a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp_ns.dts +++ b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp_ns.dts @@ -58,6 +58,9 @@ }; &cpuapp_rram { + /* TODO: revert this hack when TF-M update is available that fixes partition sizes */ + reg = <0x0 DT_SIZE_K(1022)>; + partitions { compatible = "fixed-partitions"; #address-cells = <1>; From 56d8000bad12f1b3449e0d7db122529fa7e995a5 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Fri, 13 Jun 2025 12:17:30 +0100 Subject: [PATCH 04/10] [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 (cherry picked from commit 124a803fc4a0f3976e89e492c628ec9cae56b074) --- .../bl54l15_dvk_nrf54l15_cpuapp.dts | 40 +---------------- .../bl54l15_dvk_nrf54l15_cpuapp.yaml | 2 +- .../bl54l15u_dvk_nrf54l15_cpuapp.dts | 40 +---------------- .../bl54l15u_dvk_nrf54l15_cpuapp.yaml | 2 +- .../nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp.dts | 41 +----------------- .../nrf54l15dk_nrf54l15_cpuapp.yaml | 2 +- .../panb511evb/panb511evb_nrf54l15_cpuapp.dts | 40 +---------------- .../panb511evb_nrf54l15_cpuapp.yaml | 2 +- .../raytac_an54l15q_db_nrf54l15_cpuapp.dts | 40 +---------------- .../raytac_an54l15q_db_nrf54l15_cpuapp.yaml | 2 +- .../ophelia4ev/ophelia4ev_nrf54l15_cpuapp.dts | 43 ++----------------- .../ophelia4ev_nrf54l15_cpuapp.yaml | 2 +- dts/vendor/nordic/nrf54l15_partition.dtsi | 33 ++++++++++++++ 13 files changed, 52 insertions(+), 237 deletions(-) create mode 100644 dts/vendor/nordic/nrf54l15_partition.dtsi diff --git a/boards/ezurio/bl54l15_dvk/bl54l15_dvk_nrf54l15_cpuapp.dts b/boards/ezurio/bl54l15_dvk/bl54l15_dvk_nrf54l15_cpuapp.dts index ef92bda9930..50a03e2d48f 100644 --- a/boards/ezurio/bl54l15_dvk/bl54l15_dvk_nrf54l15_cpuapp.dts +++ b/boards/ezurio/bl54l15_dvk/bl54l15_dvk_nrf54l15_cpuapp.dts @@ -20,41 +20,5 @@ }; }; -&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)>; - }; - }; -}; +/* Include default memory partition configuration file */ +#include diff --git a/boards/ezurio/bl54l15_dvk/bl54l15_dvk_nrf54l15_cpuapp.yaml b/boards/ezurio/bl54l15_dvk/bl54l15_dvk_nrf54l15_cpuapp.yaml index abcf0f54482..066929a10a6 100644 --- a/boards/ezurio/bl54l15_dvk/bl54l15_dvk_nrf54l15_cpuapp.yaml +++ b/boards/ezurio/bl54l15_dvk/bl54l15_dvk_nrf54l15_cpuapp.yaml @@ -11,7 +11,7 @@ toolchain: - zephyr sysbuild: true ram: 188 -flash: 324 +flash: 1428 supported: - adc - counter diff --git a/boards/ezurio/bl54l15u_dvk/bl54l15u_dvk_nrf54l15_cpuapp.dts b/boards/ezurio/bl54l15u_dvk/bl54l15u_dvk_nrf54l15_cpuapp.dts index 7ea5099aa3f..00ffc3f5449 100644 --- a/boards/ezurio/bl54l15u_dvk/bl54l15u_dvk_nrf54l15_cpuapp.dts +++ b/boards/ezurio/bl54l15u_dvk/bl54l15u_dvk_nrf54l15_cpuapp.dts @@ -20,41 +20,5 @@ }; }; -&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)>; - }; - }; -}; +/* Include default memory partition configuration file */ +#include diff --git a/boards/ezurio/bl54l15u_dvk/bl54l15u_dvk_nrf54l15_cpuapp.yaml b/boards/ezurio/bl54l15u_dvk/bl54l15u_dvk_nrf54l15_cpuapp.yaml index 264368c2baf..d210534c8b5 100644 --- a/boards/ezurio/bl54l15u_dvk/bl54l15u_dvk_nrf54l15_cpuapp.yaml +++ b/boards/ezurio/bl54l15u_dvk/bl54l15u_dvk_nrf54l15_cpuapp.yaml @@ -11,7 +11,7 @@ toolchain: - zephyr sysbuild: true ram: 188 -flash: 324 +flash: 1428 supported: - adc - counter diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp.dts b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp.dts index b2d96daa192..6e662902561 100644 --- a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp.dts +++ b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp.dts @@ -19,42 +19,5 @@ }; }; -&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)>; - }; - }; -}; +/* Include default memory partition configuration file */ +#include diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp.yaml b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp.yaml index 3fbfefe01a3..e23a2a0073a 100644 --- a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp.yaml +++ b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp.yaml @@ -10,7 +10,7 @@ toolchain: - zephyr sysbuild: true ram: 188 -flash: 324 +flash: 1428 supported: - adc - counter diff --git a/boards/panasonic/panb511evb/panb511evb_nrf54l15_cpuapp.dts b/boards/panasonic/panb511evb/panb511evb_nrf54l15_cpuapp.dts index c79847a3b57..04616affd14 100644 --- a/boards/panasonic/panb511evb/panb511evb_nrf54l15_cpuapp.dts +++ b/boards/panasonic/panb511evb/panb511evb_nrf54l15_cpuapp.dts @@ -19,41 +19,5 @@ }; }; -&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)>; - }; - }; -}; +/* Include default memory partition configuration file */ +#include diff --git a/boards/panasonic/panb511evb/panb511evb_nrf54l15_cpuapp.yaml b/boards/panasonic/panb511evb/panb511evb_nrf54l15_cpuapp.yaml index e911ee9e54c..db252d56047 100644 --- a/boards/panasonic/panb511evb/panb511evb_nrf54l15_cpuapp.yaml +++ b/boards/panasonic/panb511evb/panb511evb_nrf54l15_cpuapp.yaml @@ -10,7 +10,7 @@ toolchain: - zephyr sysbuild: true ram: 188 -flash: 324 +flash: 1428 supported: - adc - counter diff --git a/boards/raytac/an54l15q_db/raytac_an54l15q_db_nrf54l15_cpuapp.dts b/boards/raytac/an54l15q_db/raytac_an54l15q_db_nrf54l15_cpuapp.dts index d9362a6ddb0..d347ef16ac1 100644 --- a/boards/raytac/an54l15q_db/raytac_an54l15q_db_nrf54l15_cpuapp.dts +++ b/boards/raytac/an54l15q_db/raytac_an54l15q_db_nrf54l15_cpuapp.dts @@ -21,41 +21,5 @@ }; }; -&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)>; - }; - }; -}; +/* Include default memory partition configuration file */ +#include diff --git a/boards/raytac/an54l15q_db/raytac_an54l15q_db_nrf54l15_cpuapp.yaml b/boards/raytac/an54l15q_db/raytac_an54l15q_db_nrf54l15_cpuapp.yaml index 4e3b9067475..7a5e9a84f96 100644 --- a/boards/raytac/an54l15q_db/raytac_an54l15q_db_nrf54l15_cpuapp.yaml +++ b/boards/raytac/an54l15q_db/raytac_an54l15q_db_nrf54l15_cpuapp.yaml @@ -12,7 +12,7 @@ toolchain: - zephyr sysbuild: true ram: 188 -flash: 324 +flash: 1428 supported: - adc - counter diff --git a/boards/we/ophelia4ev/ophelia4ev_nrf54l15_cpuapp.dts b/boards/we/ophelia4ev/ophelia4ev_nrf54l15_cpuapp.dts index 73b135891a8..2380fcd5b8d 100644 --- a/boards/we/ophelia4ev/ophelia4ev_nrf54l15_cpuapp.dts +++ b/boards/we/ophelia4ev/ophelia4ev_nrf54l15_cpuapp.dts @@ -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 { status = "okay"; }; @@ -172,3 +132,6 @@ &adc { status = "okay"; }; + +/* Include default memory partition configuration file */ +#include diff --git a/boards/we/ophelia4ev/ophelia4ev_nrf54l15_cpuapp.yaml b/boards/we/ophelia4ev/ophelia4ev_nrf54l15_cpuapp.yaml index 87fee9c3d62..6e8bd507277 100644 --- a/boards/we/ophelia4ev/ophelia4ev_nrf54l15_cpuapp.yaml +++ b/boards/we/ophelia4ev/ophelia4ev_nrf54l15_cpuapp.yaml @@ -10,7 +10,7 @@ toolchain: - zephyr sysbuild: true ram: 188 -flash: 324 +flash: 1428 supported: - adc - counter diff --git a/dts/vendor/nordic/nrf54l15_partition.dtsi b/dts/vendor/nordic/nrf54l15_partition.dtsi new file mode 100644 index 00000000000..4988de3ed54 --- /dev/null +++ b/dts/vendor/nordic/nrf54l15_partition.dtsi @@ -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)>; + }; + }; +}; From 913c975806abd703d60f84ac66bdd9fbfd843bcd Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Fri, 13 Jun 2025 13:37:31 +0100 Subject: [PATCH 05/10] [nrf fromtree] boards: nordic: nrf54l15_ns: Change to use common dts partitioning file Adds a common vendor dts file specifying the default partition layout for nRF54L15-based cpuapp_ns board targets and updates boards to use this common file. Signed-off-by: Jamie McCrae (cherry picked from commit e542188ce9c07e89d5d47791ea92a539eb38ab40) --- .../bl54l15_dvk_nrf54l15_cpuapp_ns.dts | 48 +------------- .../bl54l15u_dvk_nrf54l15_cpuapp_ns.dts | 48 +------------- .../nrf54l15dk_nrf54l15_cpuapp_ns.dts | 48 +------------- .../panb511evb_nrf54l15_cpuapp_ns.dts | 48 +------------- .../raytac_an54l15q_db_nrf54l15_cpuapp_ns.dts | 48 +------------- dts/vendor/nordic/nrf54l15_ns_partition.dtsi | 62 +++++++++++++++++++ 6 files changed, 77 insertions(+), 225 deletions(-) create mode 100644 dts/vendor/nordic/nrf54l15_ns_partition.dtsi diff --git a/boards/ezurio/bl54l15_dvk/bl54l15_dvk_nrf54l15_cpuapp_ns.dts b/boards/ezurio/bl54l15_dvk/bl54l15_dvk_nrf54l15_cpuapp_ns.dts index 38712ba7074..bca01b2b062 100644 --- a/boards/ezurio/bl54l15_dvk/bl54l15_dvk_nrf54l15_cpuapp_ns.dts +++ b/boards/ezurio/bl54l15_dvk/bl54l15_dvk_nrf54l15_cpuapp_ns.dts @@ -58,51 +58,6 @@ }; }; -&cpuapp_rram { - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - /* nRF54L15 has 1524 kB of non volatile memory (RRAM) but the - * last 96kB are reserved for the FLPR MCU. - * - * This static layout needs to be the same with the upstream TF-M layout in the - * header flash_layout.h of the relevant platform. Any updates in the layout - * needs to happen both in the flash_layout.h and in this file at the same time. - */ - slot0_partition: partition@0 { - label = "image-0"; - reg = <0x0000000 DT_SIZE_K(512)>; - }; - - tfm_ps_partition: partition@80000 { - label = "tfm-ps"; - reg = <0x00080000 DT_SIZE_K(16)>; - }; - - tfm_its_partition: partition@84000 { - label = "tfm-its"; - reg = <0x00084000 DT_SIZE_K(16)>; - }; - - tfm_otp_partition: partition@88000 { - label = "tfm-otp"; - reg = <0x00088000 DT_SIZE_K(8)>; - }; - - slot0_ns_partition: partition@8A000 { - label = "image-0-nonsecure"; - reg = <0x0008A000 DT_SIZE_K(844)>; - }; - - storage_partition: partition@15D000 { - label = "storage"; - reg = <0x00015D000 DT_SIZE_K(32)>; - }; - }; -}; - &uart30 { /* Disable so that TF-M can use this UART */ status = "disabled"; @@ -112,3 +67,6 @@ pinctrl-1 = <&uart30_sleep>; pinctrl-names = "default", "sleep"; }; + +/* Include default memory partition configuration file */ +#include diff --git a/boards/ezurio/bl54l15u_dvk/bl54l15u_dvk_nrf54l15_cpuapp_ns.dts b/boards/ezurio/bl54l15u_dvk/bl54l15u_dvk_nrf54l15_cpuapp_ns.dts index f03eb6a5e81..6530b554d34 100644 --- a/boards/ezurio/bl54l15u_dvk/bl54l15u_dvk_nrf54l15_cpuapp_ns.dts +++ b/boards/ezurio/bl54l15u_dvk/bl54l15u_dvk_nrf54l15_cpuapp_ns.dts @@ -58,51 +58,6 @@ }; }; -&cpuapp_rram { - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - /* nRF54L15 has 1524 kB of non volatile memory (RRAM) but the - * last 96kB are reserved for the FLPR MCU. - * - * This static layout needs to be the same with the upstream TF-M layout in the - * header flash_layout.h of the relevant platform. Any updates in the layout - * needs to happen both in the flash_layout.h and in this file at the same time. - */ - slot0_partition: partition@0 { - label = "image-0"; - reg = <0x0000000 DT_SIZE_K(512)>; - }; - - tfm_ps_partition: partition@80000 { - label = "tfm-ps"; - reg = <0x00080000 DT_SIZE_K(16)>; - }; - - tfm_its_partition: partition@84000 { - label = "tfm-its"; - reg = <0x00084000 DT_SIZE_K(16)>; - }; - - tfm_otp_partition: partition@88000 { - label = "tfm-otp"; - reg = <0x00088000 DT_SIZE_K(8)>; - }; - - slot0_ns_partition: partition@8A000 { - label = "image-0-nonsecure"; - reg = <0x0008A000 DT_SIZE_K(844)>; - }; - - storage_partition: partition@15D000 { - label = "storage"; - reg = <0x00015D000 DT_SIZE_K(32)>; - }; - }; -}; - &uart30 { /* Disable so that TF-M can use this UART */ status = "disabled"; @@ -112,3 +67,6 @@ pinctrl-1 = <&uart30_sleep>; pinctrl-names = "default", "sleep"; }; + +/* Include default memory partition configuration file */ +#include diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns.dts b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns.dts index 3a7ca70eaed..f78a1f864e2 100644 --- a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns.dts +++ b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns.dts @@ -57,51 +57,6 @@ }; }; -&cpuapp_rram { - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - /* nRF54L15 has 1524 kB of non volatile memory (RRAM) but the - * last 96kB are reserved for the FLPR MCU. - * - * This static layout needs to be the same with the upstream TF-M layout in the - * header flash_layout.h of the relevant platform. Any updates in the layout - * needs to happen both in the flash_layout.h and in this file at the same time. - */ - slot0_partition: partition@0 { - label = "image-0"; - reg = <0x0000000 DT_SIZE_K(512)>; - }; - - tfm_ps_partition: partition@80000 { - label = "tfm-ps"; - reg = <0x00080000 DT_SIZE_K(16)>; - }; - - tfm_its_partition: partition@84000 { - label = "tfm-its"; - reg = <0x00084000 DT_SIZE_K(16)>; - }; - - tfm_otp_partition: partition@88000 { - label = "tfm-otp"; - reg = <0x00088000 DT_SIZE_K(8)>; - }; - - slot0_ns_partition: partition@8A000 { - label = "image-0-nonsecure"; - reg = <0x0008A000 DT_SIZE_K(844)>; - }; - - storage_partition: partition@15D000 { - label = "storage"; - reg = <0x00015D000 DT_SIZE_K(32)>; - }; - }; -}; - &uart30 { /* Disable so that TF-M can use this UART */ status = "disabled"; @@ -111,3 +66,6 @@ pinctrl-1 = <&uart30_sleep>; pinctrl-names = "default", "sleep"; }; + +/* Include default memory partition configuration file */ +#include diff --git a/boards/panasonic/panb511evb/panb511evb_nrf54l15_cpuapp_ns.dts b/boards/panasonic/panb511evb/panb511evb_nrf54l15_cpuapp_ns.dts index f4aeab933f8..4f5ea303316 100644 --- a/boards/panasonic/panb511evb/panb511evb_nrf54l15_cpuapp_ns.dts +++ b/boards/panasonic/panb511evb/panb511evb_nrf54l15_cpuapp_ns.dts @@ -57,51 +57,6 @@ }; }; -&cpuapp_rram { - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - /* nRF54L15 has 1524 kB of non volatile memory (RRAM) but the - * last 96kB are reserved for the FLPR MCU. - * - * This static layout needs to be the same with the upstream TF-M layout in the - * header flash_layout.h of the relevant platform. Any updates in the layout - * needs to happen both in the flash_layout.h and in this file at the same time. - */ - slot0_partition: partition@0 { - label = "image-0"; - reg = <0x0000000 DT_SIZE_K(512)>; - }; - - tfm_ps_partition: partition@80000 { - label = "tfm-ps"; - reg = <0x00080000 DT_SIZE_K(16)>; - }; - - tfm_its_partition: partition@84000 { - label = "tfm-its"; - reg = <0x00084000 DT_SIZE_K(16)>; - }; - - tfm_otp_partition: partition@88000 { - label = "tfm-otp"; - reg = <0x00088000 DT_SIZE_K(8)>; - }; - - slot0_ns_partition: partition@8A000 { - label = "image-0-nonsecure"; - reg = <0x0008A000 DT_SIZE_K(844)>; - }; - - storage_partition: partition@15D000 { - label = "storage"; - reg = <0x00015D000 DT_SIZE_K(32)>; - }; - }; -}; - &uart20 { /* Disable so that TF-M can use this UART */ status = "disabled"; @@ -111,3 +66,6 @@ pinctrl-1 = <&uart20_sleep>; pinctrl-names = "default", "sleep"; }; + +/* Include default memory partition configuration file */ +#include diff --git a/boards/raytac/an54l15q_db/raytac_an54l15q_db_nrf54l15_cpuapp_ns.dts b/boards/raytac/an54l15q_db/raytac_an54l15q_db_nrf54l15_cpuapp_ns.dts index db7a01aead8..d6395d7fd71 100644 --- a/boards/raytac/an54l15q_db/raytac_an54l15q_db_nrf54l15_cpuapp_ns.dts +++ b/boards/raytac/an54l15q_db/raytac_an54l15q_db_nrf54l15_cpuapp_ns.dts @@ -58,51 +58,6 @@ }; }; -&cpuapp_rram { - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - /* nRF54L15 has 1524 kB of non volatile memory (RRAM) but the - * last 96kB are reserved for the FLPR MCU. - * - * This static layout needs to be the same with the upstream TF-M layout in the - * header flash_layout.h of the relevant platform. Any updates in the layout - * needs to happen both in the flash_layout.h and in this file at the same time. - */ - slot0_partition: partition@0 { - label = "image-0"; - reg = <0x0000000 DT_SIZE_K(512)>; - }; - - tfm_ps_partition: partition@80000 { - label = "tfm-ps"; - reg = <0x00080000 DT_SIZE_K(16)>; - }; - - tfm_its_partition: partition@84000 { - label = "tfm-its"; - reg = <0x00084000 DT_SIZE_K(16)>; - }; - - tfm_otp_partition: partition@88000 { - label = "tfm-otp"; - reg = <0x00088000 DT_SIZE_K(8)>; - }; - - slot0_ns_partition: partition@8A000 { - label = "image-0-nonsecure"; - reg = <0x0008A000 DT_SIZE_K(844)>; - }; - - storage_partition: partition@15D000 { - label = "storage"; - reg = <0x00015D000 DT_SIZE_K(32)>; - }; - }; -}; - &uart30 { /* Disable so that TF-M can use this UART */ status = "disabled"; @@ -111,3 +66,6 @@ pinctrl-1 = <&uart30_sleep>; pinctrl-names = "default", "sleep"; }; + +/* Include default memory partition configuration file */ +#include diff --git a/dts/vendor/nordic/nrf54l15_ns_partition.dtsi b/dts/vendor/nordic/nrf54l15_ns_partition.dtsi new file mode 100644 index 00000000000..ac15dc79f33 --- /dev/null +++ b/dts/vendor/nordic/nrf54l15_ns_partition.dtsi @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2025 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: Apache-2.0 + */ + +&cpuapp_rram { + /* + * Default NVM layout on NRF54L15 Application MCU without BL2: + * This layout matches (by necessity) that in the TF-M repository: + * + * 0x0000_0000 Secure image primary (512 KB) + * 0x0008_0000 Protected Storage Area (16 KB) + * 0x0008_4000 Internal Trusted Storage Area (16 KB) + * 0x0008_8000 OTP / NV counters area (8 KB) + * 0x0008_A000 Non-secure image primary (844 KB) + * 0x0015_D000 Non-secure storage, used when built with NRF_NS_STORAGE=ON, + * otherwise unused (32 KB) + */ + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + /* nRF54L15 has 1524 kB of non volatile memory (RRAM) but the + * last 96kB are reserved for the FLPR MCU. + * + * This static layout needs to be the same with the upstream TF-M layout in the + * header flash_layout.h of the relevant platform. Any updates in the layout + * needs to happen both in the flash_layout.h and in this file at the same time. + */ + slot0_partition: partition@0 { + label = "image-0"; + reg = <0x0000000 DT_SIZE_K(512)>; + }; + + tfm_ps_partition: partition@80000 { + label = "tfm-ps"; + reg = <0x00080000 DT_SIZE_K(16)>; + }; + + tfm_its_partition: partition@84000 { + label = "tfm-its"; + reg = <0x00084000 DT_SIZE_K(16)>; + }; + + tfm_otp_partition: partition@88000 { + label = "tfm-otp"; + reg = <0x00088000 DT_SIZE_K(8)>; + }; + + slot0_ns_partition: partition@8A000 { + label = "image-0-nonsecure"; + reg = <0x0008A000 DT_SIZE_K(844)>; + }; + + storage_partition: partition@15D000 { + label = "storage"; + reg = <0x00015D000 DT_SIZE_K(32)>; + }; + }; +}; From 56976c246d4e5f9bc5be957f61e10af06ca9f8da Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Tue, 17 Jun 2025 07:57:29 +0100 Subject: [PATCH 06/10] [nrf fromtree] boards: nordic: nrf54l05: Change to use common dts partitioning file Adds a common vendor dts file specifying the default partition layout for nRF54L05-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 (cherry picked from commit 5bc71e6e9b77fb6df120c3007bfe861f9036a930) --- .../nrf54l15dk/nrf54l15dk_nrf54l05_cpuapp.dts | 44 +------------------ .../nrf54l15dk_nrf54l05_cpuapp.yaml | 2 +- dts/vendor/nordic/nrf54l05_partition.dtsi | 38 ++++++++++++++++ 3 files changed, 41 insertions(+), 43 deletions(-) create mode 100644 dts/vendor/nordic/nrf54l05_partition.dtsi diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l05_cpuapp.dts b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l05_cpuapp.dts index 23ae87ccb11..2c30c727005 100644 --- a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l05_cpuapp.dts +++ b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l05_cpuapp.dts @@ -25,45 +25,5 @@ ranges = <0x0 0x20000000 DT_SIZE_K(96)>; }; -&cpuapp_rram { - reg = <0x0 DT_SIZE_K(500)>; -}; - -/* These partition sizes assume no FLPR area in RRAM */ -&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(100)>; - }; - - slot0_ns_partition: partition@29000 { - label = "image-0-nonsecure"; - reg = <0x29000 DT_SIZE_K(100)>; - }; - - slot1_partition: partition@42000 { - label = "image-1"; - reg = <0x42000 DT_SIZE_K(100)>; - }; - - slot1_ns_partition: partition@5b000 { - label = "image-1-nonsecure"; - reg = <0x5b000 DT_SIZE_K(100)>; - }; - - storage_partition: partition@74000 { - label = "storage"; - reg = <0x74000 DT_SIZE_K(36)>; - }; - }; -}; +/* Include default memory partition configuration file */ +#include diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l05_cpuapp.yaml b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l05_cpuapp.yaml index 2a41fbf2ca1..cda8efcd610 100644 --- a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l05_cpuapp.yaml +++ b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l05_cpuapp.yaml @@ -10,7 +10,7 @@ toolchain: - zephyr sysbuild: true ram: 96 -flash: 100 +flash: 500 supported: - adc - counter diff --git a/dts/vendor/nordic/nrf54l05_partition.dtsi b/dts/vendor/nordic/nrf54l05_partition.dtsi new file mode 100644 index 00000000000..aa2ea04bce0 --- /dev/null +++ b/dts/vendor/nordic/nrf54l05_partition.dtsi @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2025 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: Apache-2.0 + */ + +&cpuapp_rram { + reg = <0x0 DT_SIZE_K(500)>; +}; + +/* These partition sizes assume no FLPR area in RRAM */ +&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(200)>; + }; + + slot1_partition: partition@42000 { + label = "image-1"; + reg = <0x42000 DT_SIZE_K(200)>; + }; + + storage_partition: partition@74000 { + label = "storage"; + reg = <0x74000 DT_SIZE_K(36)>; + }; + }; +}; From fe04f475377206a1df9dbcddacd4e00dcc5e9ea4 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Tue, 17 Jun 2025 08:57:11 +0100 Subject: [PATCH 07/10] [nrf fromtree] samples: fs: fs_sample: Fix nrf54l15 dts overlay files Fixes these files to no lonegr delete non-secure partitions as these no longer exist Signed-off-by: Jamie McCrae (cherry picked from commit 97e5d3321496691b1a32e974c2eb6215d39a0379) --- .../fs/fs_sample/boards/bl54l15_dvk_nrf54l15_cpuapp.overlay | 2 -- .../fs/fs_sample/boards/bl54l15u_dvk_nrf54l15_cpuapp.overlay | 2 -- .../fs/fs_sample/boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 3 +-- .../fs/fs_sample/boards/ophelia4ev_nrf54l15_cpuapp.overlay | 2 -- 4 files changed, 1 insertion(+), 8 deletions(-) diff --git a/samples/subsys/fs/fs_sample/boards/bl54l15_dvk_nrf54l15_cpuapp.overlay b/samples/subsys/fs/fs_sample/boards/bl54l15_dvk_nrf54l15_cpuapp.overlay index 2311a039702..5a063e3b862 100644 --- a/samples/subsys/fs/fs_sample/boards/bl54l15_dvk_nrf54l15_cpuapp.overlay +++ b/samples/subsys/fs/fs_sample/boards/bl54l15_dvk_nrf54l15_cpuapp.overlay @@ -11,8 +11,6 @@ */ /delete-node/ &slot0_partition; /delete-node/ &slot1_partition; -/delete-node/ &slot0_ns_partition; -/delete-node/ &slot1_ns_partition; /delete-node/ &storage_partition; &cpuapp_rram { diff --git a/samples/subsys/fs/fs_sample/boards/bl54l15u_dvk_nrf54l15_cpuapp.overlay b/samples/subsys/fs/fs_sample/boards/bl54l15u_dvk_nrf54l15_cpuapp.overlay index 2311a039702..5a063e3b862 100644 --- a/samples/subsys/fs/fs_sample/boards/bl54l15u_dvk_nrf54l15_cpuapp.overlay +++ b/samples/subsys/fs/fs_sample/boards/bl54l15u_dvk_nrf54l15_cpuapp.overlay @@ -11,8 +11,6 @@ */ /delete-node/ &slot0_partition; /delete-node/ &slot1_partition; -/delete-node/ &slot0_ns_partition; -/delete-node/ &slot1_ns_partition; /delete-node/ &storage_partition; &cpuapp_rram { diff --git a/samples/subsys/fs/fs_sample/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/samples/subsys/fs/fs_sample/boards/nrf54l15dk_nrf54l15_cpuapp.overlay index 391afea75a4..b7544821893 100644 --- a/samples/subsys/fs/fs_sample/boards/nrf54l15dk_nrf54l15_cpuapp.overlay +++ b/samples/subsys/fs/fs_sample/boards/nrf54l15dk_nrf54l15_cpuapp.overlay @@ -10,8 +10,6 @@ */ /delete-node/ &slot0_partition; /delete-node/ &slot1_partition; -/delete-node/ &slot0_ns_partition; -/delete-node/ &slot1_ns_partition; /delete-node/ &storage_partition; &cpuapp_rram { @@ -23,6 +21,7 @@ slot0_partition: parition@10000 { reg = <0x00010000 DT_SIZE_K(300)>; }; + slot1_partition: partition@5b000 { reg = <0x0005b000 DT_SIZE_K(300)>; }; diff --git a/samples/subsys/fs/fs_sample/boards/ophelia4ev_nrf54l15_cpuapp.overlay b/samples/subsys/fs/fs_sample/boards/ophelia4ev_nrf54l15_cpuapp.overlay index da13128938a..339c971683a 100644 --- a/samples/subsys/fs/fs_sample/boards/ophelia4ev_nrf54l15_cpuapp.overlay +++ b/samples/subsys/fs/fs_sample/boards/ophelia4ev_nrf54l15_cpuapp.overlay @@ -10,8 +10,6 @@ */ /delete-node/ &slot0_partition; /delete-node/ &slot1_partition; -/delete-node/ &slot0_ns_partition; -/delete-node/ &slot1_ns_partition; /delete-node/ &storage_partition; &cpuapp_rram { From 801cdffb7d037f72db62f321cf3248633a081465 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Mon, 28 Jul 2025 13:34:16 +0100 Subject: [PATCH 08/10] Revert "[nrf noup] samples/../smp_svr: fix nrf54l15pdk ext flash dts overlay" This reverts commit 8468245eab3214ab808917bc247b6d75e0c0034f. Signed-off-by: Jamie McCrae --- .../boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay b/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay index ddbd39f4bde..76b648903a0 100644 --- a/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay +++ b/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay @@ -13,8 +13,7 @@ /delete-node/ &storage_partition; -&cpuapp_rram { - reg = < 0x0 DT_SIZE_K(1524) >; +&rram0 { partitions { boot_partition: partition@0 { label = "mcuboot"; From b57bf196482b694ece5bf2459ab6d3a85bc6ae2a Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Mon, 28 Jul 2025 13:34:30 +0100 Subject: [PATCH 09/10] Revert "[nrf noup] samples/smp_svr: nrf54l15pdk ext-flash partition" This reverts commit ed81da7444573efac44d7a5de3f756faefe77852. Signed-off-by: Jamie McCrae --- ...f54l15dk_nrf54l15_cpuapp_ext_flash.overlay | 36 ------------------- 1 file changed, 36 deletions(-) diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay b/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay index 76b648903a0..410388bfa6d 100644 --- a/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay +++ b/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay @@ -4,42 +4,6 @@ }; }; -/delete-node/ &boot_partition; -/delete-node/ &slot0_partition; -/delete-node/ &slot1_partition; - -/delete-node/ &slot0_ns_partition; -/delete-node/ &slot1_ns_partition; - -/delete-node/ &storage_partition; - -&rram0 { - partitions { - boot_partition: partition@0 { - label = "mcuboot"; - reg = <0x000000000 0x00014000>; - }; - slot0_partition: partition@14000 { - label = "image-0"; - reg = <0x000014000 0x0015A000>; - }; - storage_partition: partition@16E000 { - label = "storage"; - reg = < 0x16E000 0x9000 >; - }; - }; -}; - &mx25r64 { status = "okay"; - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - slot1_partition: partition@0 { - label = "image-1"; - reg = <0x000000000 0x0015A000>; - }; - }; }; From 653de466bbe72c6319f33d2951af5ab213b3d36c Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Mon, 28 Jul 2025 13:34:58 +0100 Subject: [PATCH 10/10] [nrf noup] samples: mgmt: mcumgr: smp_svr: Fix nrf54l15 dtc overlay file nrf-squash! [nrf noup] samples: smp_svr: configuration for nrf54l15 Fixes this file to be correctly formatted and not delete the (now) non-existent non-secure partitions Signed-off-by: Jamie McCrae --- ...f54l15dk_nrf54l15_cpuapp_ext_flash.overlay | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay b/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay index 410388bfa6d..c8040e40ffd 100644 --- a/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay +++ b/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay @@ -4,6 +4,43 @@ }; }; +/delete-node/ &boot_partition; +/delete-node/ &slot0_partition; +/delete-node/ &slot1_partition; +/delete-node/ &storage_partition; + +&cpuapp_rram { + reg = <0x0 DT_SIZE_K(1524)>; + + partitions { + boot_partition: partition@0 { + label = "mcuboot"; + reg = <0x000000000 0x00014000>; + }; + + slot0_partition: partition@14000 { + label = "image-0"; + reg = <0x000014000 0x0015A000>; + }; + + storage_partition: partition@16E000 { + label = "storage"; + reg = < 0x16E000 0x9000 >; + }; + }; +}; + &mx25r64 { status = "okay"; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + slot1_partition: partition@0 { + label = "image-1"; + reg = <0x000000000 0x0015A000>; + }; + }; };