scripts/west_commands/create_board: extend support to nRF54L05/10

Also fix some issues found on nRF54L15 due to changes/improvements
in the upstream reference boards.

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

Author: gmarull

scripts/west_commands/create_board/config.yml

@@ -63,6 +63,22 @@ products:
                 flash: 246
   - series: nrf54l
     socs:
+      - name: nrf54l05
+        variants:
+          - name: qfaa
+            cores:
+              - name: cpuapp
+                arch: arm
+                ram: 96
+                flash: 500
+      - name: nrf54l10
+        variants:
+          - name: qfaa
+            cores:
+              - name: cpuapp
+                arch: arm
+                ram: 192
+                flash: 1012
       - name: nrf54l15
         variants:
           - name: qfaa
@@ -71,6 +87,11 @@ products:
                 arch: arm
                 ram: 188
                 flash: 1428
+              - name: cpuflpr
+                arch: riscv
+                ram: 96
+                flash: 96
+                xip: true
   - series: nrf91
     socs:
       - name: nrf9131

scripts/west_commands/create_board/schema.json

@@ -39,6 +39,8 @@
         "nRF52840-QFAA",
         "nRF52840-QIAA",
         "nRF5340-QKAA",
+        "nRF54L05-QFAA",
+        "nRF54L10-QFAA",
         "nRF54L15-QFAA",
         "nRF9131-LACA",
         "nRF9151-LACA",

scripts/west_commands/create_board/templates/nrf54l/Kconfig.defconfig.jinja2

@@ -1,6 +1,10 @@
+config HW_STACK_PROTECTION
+	default ARCH_HAS_STACK_PROTECTION
+
 if BOARD_{{ board | upper }}_{{ soc | upper }}_CPUAPP
 
 config ROM_START_OFFSET
+	default 0 if PARTITION_MANAGER_ENABLED
 	default 0x800 if BOOTLOADER_MCUBOOT
 
 endif # BOARD_{{ board | upper }}_{{ soc | upper }}_CPUAPP

scripts/west_commands/create_board/templates/nrf54l/board.cmake.jinja2

@@ -1,7 +1,7 @@
 if (CONFIG_SOC_{{ soc | upper }}_CPUAPP)
-  board_runner_args(jlink "--device={{ soc | replace("nrf", "nRF") }}_M33" "--speed=4000")
+  board_runner_args(jlink "--device={{ soc | replace("nrf", "nRF") | replace("l", "L") }}_M33" "--speed=4000")
 elseif (CONFIG_SOC_{{ soc | upper }}_CPUFLPR)
-  board_runner_args(jlink "--device={{ soc | replace("nrf", "nRF") }}_RV32" "--speed=4000")
+  board_runner_args(jlink "--device={{ soc | replace("nrf", "nRF") | replace("l", "L") }}_RV32" "--speed=4000")
 endif()
 
 include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)

scripts/west_commands/create_board/templates/nrf54l/board.dts.jinja2

@@ -11,47 +11,29 @@
 		zephyr,code-partition = &slot0_partition;
 		zephyr,sram = &cpuapp_sram;
 		zephyr,flash = &cpuapp_rram;
+		zephyr,flash-controller = &rram_controller;
 	};
 };
 
-&cpuapp_sram {
-	status = "okay";
-};
-
 &grtc {
 	owned-channels = <0 1 2 3 4 5 6 7 8 9 10 11>;
 	/* Channels 7-11 reserved for Zero Latency IRQs, 3-4 for FLPR */
 	child-owned-channels = <3 4 7 8 9 10 11>;
 	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(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)>;
-		};
-	};
+&cpuapp_sram {
+	status = "okay";
+{% if soc == "nrf54l05" %}
+	reg = <0x20000000 DT_SIZE_K(96)>;
+	ranges = <0x0 0x20000000 DT_SIZE_K(96)>;
+{% elif soc == "nrf54l10" %}
+	reg = <0x20000000 DT_SIZE_K(192)>;
+	ranges = <0x0 0x20000000 DT_SIZE_K(192)>;
+{% endif %}
 };
+
+#include <nordic/{{ soc }}_partition.dtsi>
 {% else %}
 {% if not target['xip'] %}
 /dts-v1/;

scripts/west_commands/create_board/templates/nrf54l/board_defconfig.jinja2

@@ -1,13 +1,5 @@
 {% if target['core'] == 'cpuapp' %}
 CONFIG_ARM_MPU=y
-CONFIG_HW_STACK_PROTECTION=y
-
-CONFIG_NULL_POINTER_EXCEPTION_DETECTION_NONE=y
-
-CONFIG_CACHE_MANAGEMENT=y
-CONFIG_EXTERNAL_CACHE=y
-
-CONFIG_NRF_GRTC_START_SYSCOUNTER=y
 {% else %}
 {% if not target['xip'] %}
 CONFIG_USE_DT_CODE_PARTITION=y

scripts/west_commands/create_board/west-ncs-create-board-test.sh

@@ -20,6 +20,8 @@ declare -a SOCS=(
 	"nRF52840-QFAA"
 	"nRF52840-QIAA"
 	"nRF5340-QKAA"
+	"nRF54L05-QFAA"
+	"nRF54L10-QFAA"
 	"nRF54L15-QFAA"
 	"nRF9131-LACA"
 	"nRF9151-LACA"
@@ -58,8 +60,10 @@ for soc in "${SOCS[@]}"; do
 		west build -p -b $board/$soc_name/cpunet $HELLO_WORLD
 	elif [[ $soc == nRF54L* ]]; then
 		west build -p -b $board/$soc_name/cpuapp $HELLO_WORLD
-		# west build -p -b $board/$soc_name/cpuflpr $HELLO_WORLD
-		# west build -p -b $board/$soc_name/cpuflpr/xip $HELLO_WORLD
+		if [[ $soc == nRF54L15* ]]; then
+			west build -p -b $board/$soc_name/cpuflpr $HELLO_WORLD
+			west build -p -b $board/$soc_name/cpuflpr/xip $HELLO_WORLD
+		fi
 	elif [[ $soc == nRF91* ]]; then
 		west build -p -b $board/$soc_name $HELLO_WORLD
 		west build -p -b $board/$soc_name/ns $HELLO_WORLD