Revert "[nrf fromtree] boards: nordic: nRF54L15DK: Add basic support for the L05 and L10 ICs"

This reverts commit 270c1e9.

Signed-off-by: Gerard Marull-Paretas <[email protected]>

Author: gmarull

boards/nordic/nrf54l15dk/Kconfig.defconfig

@@ -1,8 +1,7 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-if BOARD_NRF54L15DK_NRF54L05_CPUAPP || BOARD_NRF54L15DK_NRF54L10_CPUAPP || \
-	BOARD_NRF54L15DK_NRF54L15_CPUAPP
+if BOARD_NRF54L15DK_NRF54L15_CPUAPP
 
 config BT_CTLR
 	default BT
@@ -11,5 +10,4 @@ config ROM_START_OFFSET
 	default 0 if PARTITION_MANAGER_ENABLED
 	default 0x800 if BOOTLOADER_MCUBOOT
 
-endif # BOARD_NRF54L15DK_NRF54L05_CPUAPP || BOARD_NRF54L15DK_NRF54L10_CPUAPP || \
-	# BOARD_NRF54L15DK_NRF54L15_CPUAPP
+endif # BOARD_NRF54L15DK_NRF54L15_CPUAPP

boards/nordic/nrf54l15dk/Kconfig.nrf54l15dk

@@ -2,8 +2,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_NRF54L15DK
-	select SOC_NRF54L05_CPUAPP if BOARD_NRF54L15DK_NRF54L05_CPUAPP
-	select SOC_NRF54L10_CPUAPP if BOARD_NRF54L15DK_NRF54L10_CPUAPP
 	select SOC_NRF54L15_CPUAPP if BOARD_NRF54L15DK_NRF54L15_CPUAPP
 	select SOC_NRF54L15_CPUFLPR if BOARD_NRF54L15DK_NRF54L15_CPUFLPR || \
 					    BOARD_NRF54L15DK_NRF54L15_CPUFLPR_XIP

boards/nordic/nrf54l15dk/board.cmake

@@ -1,11 +1,9 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-if(CONFIG_SOC_NRF54L05_CPUAPP OR CONFIG_SOC_NRF54L10_CPUAPP OR
-		CONFIG_SOC_NRF54L15_CPUAPP)
+if(CONFIG_SOC_NRF54L15_CPUAPP)
   board_runner_args(jlink "--device=cortex-m33" "--speed=4000")
-elseif(CONFIG_SOC_NRF54L05_CPUFLPR OR CONFIG_SOC_NRF54L10_CPUFLPR OR
-		CONFIG_SOC_NRF54L15_CPUFLPR)
+elseif(CONFIG_SOC_NRF54L15_CPUFLPR)
   board_runner_args(jlink "--speed=4000")
 endif()
 

boards/nordic/nrf54l15dk/board.yml

@@ -3,8 +3,6 @@ board:
   full_name: nRF54L15 DK
   vendor: nordic
   socs:
-  - name: nrf54l05
-  - name: nrf54l10
   - name: nrf54l15
     variants:
     - name: xip

boards/nordic/nrf54l15dk/nrf54l_05_10_15_cpuapp_common.dtsi renamed to boards/nordic/nrf54l15dk/nrf54l15_cpuapp_common.dtsi

@@ -6,6 +6,7 @@
 
 /* This file is common to the secure and non-secure domain */
 
+#include <nordic/nrf54l15_cpuapp.dtsi>
 #include "nrf54l15dk_common.dtsi"
 
 / {
@@ -51,6 +52,39 @@
 	status = "okay";
 };
 
+&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)>;
+		};
+	};
+};
+
 &uart20 {
 	status = "okay";
 };

boards/nordic/nrf54l15dk/nrf54l15dk_common.dtsi

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "nrf54l15dk_nrf54l_05_10_15-pinctrl.dtsi"
+#include "nrf54l15dk_nrf54l15-pinctrl.dtsi"
 
 / {
 	leds {