build-system: propagate nRF54L15 NSIB to L05 & L10 SoC's

Added patch which allows usage same NSIB implementation as nRF54l15 on
nRF54l05 and nRF54l10 also.

Signed-off-by: Andrzej Puzdrowski <[email protected]>

Author: nvlsianpu

cmake/sysbuild/partition_manager.cmake

@@ -498,6 +498,8 @@ foreach(d APP ${PM_DOMAINS})
   sysbuild_get(${image_name}_CONFIG_SOC_NRF5340_CPUAPP IMAGE ${image_name} VAR CONFIG_SOC_NRF5340_CPUAPP KCONFIG)
   sysbuild_get(${image_name}_CONFIG_SOC_SERIES_NRF54LX IMAGE ${image_name} VAR CONFIG_SOC_SERIES_NRF54LX KCONFIG)
   sysbuild_get(${image_name}_CONFIG_SOC_NRF54L15_CPUAPP IMAGE ${image_name} VAR CONFIG_SOC_NRF54L15_CPUAPP KCONFIG)
+  sysbuild_get(${image_name}_CONFIG_SOC_NRF54L05_CPUAPP IMAGE ${image_name} VAR CONFIG_SOC_NRF54L05_CPUAPP KCONFIG)
+  sysbuild_get(${image_name}_CONFIG_SOC_NRF54L10_CPUAPP IMAGE ${image_name} VAR CONFIG_SOC_NRF54L10_CPUAPP KCONFIG)
 
   if(${image_name}_CONFIG_SOC_SERIES_NRF91X)
     # See nRF9160 Product Specification, chapter "UICR"
@@ -511,7 +513,10 @@ foreach(d APP ${PM_DOMAINS})
     set(bootconf_start_addr "0xffd080")
     set(bootconf_size 4)
 
-    if(DEFINED ${image_name}_CONFIG_SOC_NRF54L15_CPUAPP)
+    if(DEFINED ${image_name}_CONFIG_SOC_NRF54L15_CPUAPP
+      OR DEFINED ${image_name}_CONFIG_SOC_NRF54L05_CPUAPP
+      OR DEFINED ${image_name}_CONFIG_SOC_NRF54L10_CPUAPP
+      )
       set(otp_start_addr "0xffd500")
       set(otp_size 1276)  # 319 * 4
     endif()
@@ -538,7 +543,7 @@ foreach(d APP ${PM_DOMAINS})
   sysbuild_get(${image_name}_CONFIG_FLASH_SIZE IMAGE ${image_name} VAR CONFIG_FLASH_SIZE KCONFIG)
   math(EXPR flash_size "${${image_name}_CONFIG_FLASH_SIZE} * 1024" OUTPUT_FORMAT HEXADECIMAL)
 
-  if (${image_name}_CONFIG_SOC_SERIES_NRF91X OR ${image_name}_CONFIG_SOC_NRF5340_CPUAPP OR ${image_name}_CONFIG_SOC_NRF54L15_CPUAPP)
+  if (${image_name}_CONFIG_SOC_SERIES_NRF91X OR ${image_name}_CONFIG_SOC_NRF5340_CPUAPP OR ${image_name}_CONFIG_SOC_NRF54L15_CPUAPP OR ${image_name}_CONFIG_SOC_NRF54L05_CPUAPP OR ${image_name}_CONFIG_SOC_NRF54L10_CPUAPP)
     add_region(
       NAME otp
       SIZE ${otp_size}

samples/bootloader/socs/nrf54l05_cpuapp.conf

@@ -0,0 +1,18 @@
+CONFIG_CLOCK_CONTROL_NRF=n
+CONFIG_NOTIFY=n
+CONFIG_ONOFF=n
+
+CONFIG_BOOT_BANNER=n
+CONFIG_NCS_BOOT_BANNER=n
+
+# Not used by default ED25519 signature on nRF54l15
+CONFIG_PSA_USE_CRACEN_AEAD_DRIVER=n
+CONFIG_PSA_USE_CRACEN_MAC_DRIVER=n
+# Hardware support for ED25519
+CONFIG_PSA_USE_CRACEN_HASH_DRIVER=y
+CONFIG_PSA_USE_CRACEN_CIPHER_DRIVER=y
+CONFIG_PSA_USE_CRACEN_ASYMMETRIC_DRIVER=y
+
+# Link Time Optimizations
+CONFIG_ISR_TABLES_LOCAL_DECLARATION=y
+CONFIG_LTO=y

samples/bootloader/socs/nrf54l10_cpuapp.conf

@@ -0,0 +1,18 @@
+CONFIG_CLOCK_CONTROL_NRF=n
+CONFIG_NOTIFY=n
+CONFIG_ONOFF=n
+
+CONFIG_BOOT_BANNER=n
+CONFIG_NCS_BOOT_BANNER=n
+
+# Not used by default ED25519 signature on nRF54l15
+CONFIG_PSA_USE_CRACEN_AEAD_DRIVER=n
+CONFIG_PSA_USE_CRACEN_MAC_DRIVER=n
+# Hardware support for ED25519
+CONFIG_PSA_USE_CRACEN_HASH_DRIVER=y
+CONFIG_PSA_USE_CRACEN_CIPHER_DRIVER=y
+CONFIG_PSA_USE_CRACEN_ASYMMETRIC_DRIVER=y
+
+# Link Time Optimizations
+CONFIG_ISR_TABLES_LOCAL_DECLARATION=y
+CONFIG_LTO=y

subsys/bootloader/Kconfig

@@ -55,13 +55,19 @@ config SB_NUM_VER_COUNTER_SLOTS
 
 endif # SECURE_BOOT
 
+#hidden option for mark secure-boot as nRF54L15 style
+config SB_NRF54L15_STYLE_IMPL
+	bool
+	default y if SOC_NRF54L15_CPUAPP || SOC_NRF54L05_CPUAPP || SOC_NRF54L10_CPUAPP
+
 config PM_PARTITION_SIZE_PROVISION
 	hex
 	default 0x280 if SOC_SERIES_NRF91X || SOC_NRF5340_CPUAPP # Stored in OTP region
-	default 0x460 if SOC_NRF54L15_CPUAPP # Monotonic counter slot takes 4 bytes
+	# Monotonic counter slot takes 4 bytes on nRF54L Series
+	default 0x460 if SB_NRF54L15_STYLE_IMPL
 	default 0x280 if SOC_NRF5340_CPUNET # Second instance stored in internal flash of NET
 	default FPROTECT_BLOCK_SIZE
-	prompt "Flash space reserved for PROVISION" if !(SOC_NRF9160 || SOC_NRF5340_CPUAPP || SOC_NRF54L15_CPUAPP)
+	prompt "Flash space reserved for PROVISION" if !(SOC_NRF9160 || SOC_NRF5340_CPUAPP || SB_NRF54L15_STYLE_IMPL)
 	help
 	  Flash space set aside for the PROVISION partition.
 
@@ -74,7 +80,7 @@ config PM_PARTITION_SIZE_B0_IMAGE
 	default 0x7800 if !B0_MIN_PARTITION_SIZE && (SOC_NRF5340_CPUNET)
 	default FPROTECT_BLOCK_SIZE if SOC_SERIES_NRF91X || SOC_NRF5340_CPUAPP
 	default 0x3800 if SOC_NRF5340_CPUNET
-	default 0x7800 if SOC_NRF54L15_CPUAPP
+	default 0x7800 if SB_NRF54L15_STYLE_IMPL
 	default 0x7000 if !B0_MIN_PARTITION_SIZE
 	default 0x4000
 	help
@@ -106,7 +112,7 @@ config SB_CLEANUP_RAM
 
 config SB_DISABLE_SELF_RWX
 	bool "Disable read and execution on self NVM"
-	depends on SOC_NRF54L15_CPUAPP && !FPROTECT_ALLOW_COMBINED_REGIONS
+	depends on SB_NRF54L15_STYLE_IMPL && !FPROTECT_ALLOW_COMBINED_REGIONS
 	help
 	  Sets RRAMC's BOOTCONF region protection before jumping to application.
 	  It disables reads writes and execution memory area which holds NSIB.

subsys/partition_manager/CMakeLists.txt

@@ -73,7 +73,7 @@ if (CONFIG_NRF_MODEM_LIB)
   ncs_add_partition_manager_config(pm.yml.libmodem)
 endif()
 
-if(CONFIG_SOC_NRF54L15_CPUAPP)
+if(CONFIG_SOC_NRF54L15_CPUAPP OR CONFIG_SOC_NRF54L05_CPUAPP OR CONFIG_SOC_NRF54L10_CPUAPP)
   ncs_add_partition_manager_config(pm.yml.bootconf)
 endif()
 

subsys/partition_manager/pm.yml.secure_boot_storage

@@ -2,7 +2,7 @@
 
 provision:
   size: CONFIG_PM_PARTITION_SIZE_PROVISION
-#if defined(CONFIG_SOC_SERIES_NRF91X) || defined(CONFIG_SOC_NRF5340_CPUAPP) || defined(CONFIG_SOC_NRF54L15_CPUAPP)
+#if defined(CONFIG_SOC_SERIES_NRF91X) || defined(CONFIG_SOC_NRF5340_CPUAPP) || defined(CONFIG_SOC_NRF54L15_CPUAPP) || defined(CONFIG_SOC_NRF54L05_CPUAPP) || defined(CONFIG_SOC_NRF54L10_CPUAPP)
   region: otp
 #elif defined(CONFIG_SOC_NRF5340_CPUNET)
   placement:

sysbuild/Kconfig.secureboot

@@ -342,7 +342,7 @@ config SECURE_BOOT_PUBLIC_KEY_FILES
 config SUPPORT_SECURE_BOOT_BOOTCONF_LOCK_WRITES
 	bool
 	depends on !MCUBOOT_FPROTECT_ALLOW_COMBINED_REGIONS
-	default y if SOC_NRF54L15_CPUAPP
+	default y if SOC_NRF54L15_CPUAPP || SOC_NRF54L05_CPUAPP || SOC_NRF54L10_CPUAPP
 
 config SECURE_BOOT_BOOTCONF_LOCK_WRITES
 	bool "Protect bootloader's NVM from writes"