From 1f32023487e24a9e6b47bc4d6d70852b7e4e9dc6 Mon Sep 17 00:00:00 2001 From: Georgios Vasilakis Date: Fri, 8 Aug 2025 13:18:04 +0200 Subject: [PATCH] boards: bm_nrf54l: Adjust memory layout Adjust the memory layout of all the nRF54l variants to take into account that the top 64 bytes of RAM are reserved for the KMU. Here 128 bytes of memory are reserved for future proofness. Signed-off-by: Georgios Vasilakis --- .../bm_nrf54l15dk_nrf54l05_cpuapp_common.dtsi | 15 +++++++++++++++ ...nrf54l15dk_nrf54l05_cpuapp_s115_softdevice.dts | 4 ++-- ...dk_nrf54l05_cpuapp_s115_softdevice_mcuboot.dts | 4 ++-- .../bm_nrf54l15dk_nrf54l10_cpuapp_common.dtsi | 15 +++++++++++++++ ...nrf54l15dk_nrf54l10_cpuapp_s115_softdevice.dts | 4 ++-- ...dk_nrf54l10_cpuapp_s115_softdevice_mcuboot.dts | 4 ++-- .../bm_nrf54l15dk_nrf54l15_cpuapp_common.dtsi | 15 +++++++++++++++ ...nrf54l15dk_nrf54l15_cpuapp_s115_softdevice.dts | 4 ++-- ...dk_nrf54l15_cpuapp_s115_softdevice_mcuboot.dts | 4 ++-- 9 files changed, 57 insertions(+), 12 deletions(-) diff --git a/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l05_cpuapp_common.dtsi b/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l05_cpuapp_common.dtsi index d29ca7020e..1ec76b9682 100644 --- a/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l05_cpuapp_common.dtsi +++ b/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l05_cpuapp_common.dtsi @@ -12,6 +12,21 @@ zephyr,flash-controller = &rram_controller; zephyr,boot-mode = &boot_mode0; }; + + soc { + reserved-memory { + #address-cells = <1>; + #size-cells = <1>; + ranges; + + nrf_kmu_reserved_push_area: memory@20000000 { + reg = <0x20000000 0x80>; + compatible = "zephyr,memory-region", "mmio-sram"; + zephyr,memory-region = "nrf_kmu_reserved_push_area"; + status = "okay"; + }; + }; + }; }; /* Override NCS default to use entire SRAM for application CPU. */ diff --git a/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l05_cpuapp_s115_softdevice.dts b/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l05_cpuapp_s115_softdevice.dts index 278ce56b18..e1a10cb272 100644 --- a/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l05_cpuapp_s115_softdevice.dts +++ b/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l05_cpuapp_s115_softdevice.dts @@ -63,9 +63,9 @@ #address-cells = <1>; #size-cells = <1>; - softdevice_static_ram: partition@20000000 { + softdevice_static_ram: partition@20000080 { label = "softdevice_static_ram"; - reg = <0x20000000 DT_SIZE_K(5)>; + reg = <0x20000080 0x1380>; }; softdevice_dynamic_ram: partition@20001678 { diff --git a/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l05_cpuapp_s115_softdevice_mcuboot.dts b/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l05_cpuapp_s115_softdevice_mcuboot.dts index ebee46d319..ead9185c8b 100644 --- a/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l05_cpuapp_s115_softdevice_mcuboot.dts +++ b/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l05_cpuapp_s115_softdevice_mcuboot.dts @@ -99,9 +99,9 @@ #address-cells = <1>; #size-cells = <1>; - softdevice_static_ram: partition@20000000 { + softdevice_static_ram: partition@20000080 { label = "softdevice_static_ram"; - reg = <0x20000000 DT_SIZE_K(5)>; + reg = <0x20000080 0x1380>; }; softdevice_dynamic_ram: partition@20001400 { diff --git a/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l10_cpuapp_common.dtsi b/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l10_cpuapp_common.dtsi index b015fd32f4..d5743b751c 100644 --- a/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l10_cpuapp_common.dtsi +++ b/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l10_cpuapp_common.dtsi @@ -12,6 +12,21 @@ zephyr,flash-controller = &rram_controller; zephyr,boot-mode = &boot_mode0; }; + + soc { + reserved-memory { + #address-cells = <1>; + #size-cells = <1>; + ranges; + + nrf_kmu_reserved_push_area: memory@20000000 { + reg = <0x20000000 0x80>; + compatible = "zephyr,memory-region", "mmio-sram"; + zephyr,memory-region = "nrf_kmu_reserved_push_area"; + status = "okay"; + }; + }; + }; }; /* Override NCS default to use entire SRAM for application CPU. */ diff --git a/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l10_cpuapp_s115_softdevice.dts b/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l10_cpuapp_s115_softdevice.dts index 99759fa93f..4f1244e076 100644 --- a/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l10_cpuapp_s115_softdevice.dts +++ b/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l10_cpuapp_s115_softdevice.dts @@ -63,9 +63,9 @@ #address-cells = <1>; #size-cells = <1>; - softdevice_static_ram: partition@20000000 { + softdevice_static_ram: partition@20000080 { label = "softdevice_static_ram"; - reg = <0x20000000 DT_SIZE_K(5)>; + reg = <0x20000080 0x1380>; }; softdevice_dynamic_ram: partition@20001678 { diff --git a/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l10_cpuapp_s115_softdevice_mcuboot.dts b/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l10_cpuapp_s115_softdevice_mcuboot.dts index f77faaab8f..43bc48abbb 100644 --- a/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l10_cpuapp_s115_softdevice_mcuboot.dts +++ b/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l10_cpuapp_s115_softdevice_mcuboot.dts @@ -99,9 +99,9 @@ #address-cells = <1>; #size-cells = <1>; - softdevice_static_ram: partition@20000000 { + softdevice_static_ram: partition@20000080 { label = "softdevice_static_ram"; - reg = <0x20000000 DT_SIZE_K(5)>; + reg = <0x20000080 0x1380>; }; softdevice_dynamic_ram: partition@20001400 { diff --git a/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l15_cpuapp_common.dtsi b/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l15_cpuapp_common.dtsi index 73e9c00537..55d1255865 100644 --- a/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l15_cpuapp_common.dtsi +++ b/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l15_cpuapp_common.dtsi @@ -12,6 +12,21 @@ zephyr,flash-controller = &rram_controller; zephyr,boot-mode = &boot_mode0; }; + + soc { + reserved-memory { + #address-cells = <1>; + #size-cells = <1>; + ranges; + + nrf_kmu_reserved_push_area: memory@20000000 { + reg = <0x20000000 0x80>; + compatible = "zephyr,memory-region", "mmio-sram"; + zephyr,memory-region = "nrf_kmu_reserved_push_area"; + status = "okay"; + }; + }; + }; }; /* Override NCS default to use entire SRAM for application CPU. */ diff --git a/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l15_cpuapp_s115_softdevice.dts b/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l15_cpuapp_s115_softdevice.dts index bfcd43669f..3065c83521 100644 --- a/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l15_cpuapp_s115_softdevice.dts +++ b/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l15_cpuapp_s115_softdevice.dts @@ -63,9 +63,9 @@ #address-cells = <1>; #size-cells = <1>; - softdevice_static_ram: partition@20000000 { + softdevice_static_ram: partition@20000080 { label = "softdevice_static_ram"; - reg = <0x20000000 DT_SIZE_K(5)>; + reg = <0x20000080 0x1380>; }; softdevice_dynamic_ram: partition@20001678 { diff --git a/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l15_cpuapp_s115_softdevice_mcuboot.dts b/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l15_cpuapp_s115_softdevice_mcuboot.dts index 271799160b..0d9bea1604 100644 --- a/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l15_cpuapp_s115_softdevice_mcuboot.dts +++ b/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l15_cpuapp_s115_softdevice_mcuboot.dts @@ -99,9 +99,9 @@ #address-cells = <1>; #size-cells = <1>; - softdevice_static_ram: partition@20000000 { + softdevice_static_ram: partition@20000080 { label = "softdevice_static_ram"; - reg = <0x20000000 DT_SIZE_K(5)>; + reg = <0x20000080 0x1380>; }; softdevice_dynamic_ram: partition@20001400 {