sysbuild: Add nRF54LX support for SB_CONFIG_APPROTECT

Add nRF54LX suppport for SB_CONFIG_APPROTECT_* and
SB_CONFIG_SECURE_APPROTECT_*.

Signed-off-by: Markus Lassila <[email protected]>

Author: MarkusLassila

sysbuild/CMakeLists.txt

@@ -571,15 +571,17 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_pre_cmake)
     include_sdp()
   endif()
 
-  if(SB_CONFIG_APPROTECT_USE_UICR OR SB_CONFIG_APPROTECT_LOCK OR SB_CONFIG_APPROTECT_USER_HANDLING OR
-     SB_CONFIG_SECURE_APPROTECT_USE_UICR OR SB_CONFIG_SECURE_APPROTECT_LOCK OR SB_CONFIG_SECURE_APPROTECT_USER_HANDLING)
+  if(SB_CONFIG_APPROTECT_USE_UICR OR SB_CONFIG_APPROTECT_LOCK OR SB_CONFIG_APPROTECT_USER_HANDLING OR SB_CONFIG_APPROTECT_DISABLE OR
+     SB_CONFIG_SECURE_APPROTECT_USE_UICR OR SB_CONFIG_SECURE_APPROTECT_LOCK OR SB_CONFIG_SECURE_APPROTECT_USER_HANDLING OR SB_CONFIG_SECURE_APPROTECT_DISABLE)
     # Apply APPROTECT configuration to target images
     if(SB_CONFIG_APPROTECT_USE_UICR)
       set(normal_approtect CONFIG_NRF_APPROTECT_USE_UICR)
     elseif(SB_CONFIG_APPROTECT_LOCK)
       set(normal_approtect CONFIG_NRF_APPROTECT_LOCK)
     elseif(SB_CONFIG_APPROTECT_USER_HANDLING)
       set(normal_approtect CONFIG_NRF_APPROTECT_USER_HANDLING)
+    elseif(SB_CONFIG_APPROTECT_DISABLE)
+      set(normal_approtect CONFIG_NRF_APPROTECT_DISABLE)
     endif()
 
     if(SB_CONFIG_SECURE_APPROTECT_USE_UICR)
@@ -588,6 +590,8 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_pre_cmake)
       set(secure_approtect CONFIG_NRF_SECURE_APPROTECT_LOCK)
     elseif(SB_CONFIG_SECURE_APPROTECT_USER_HANDLING)
       set(secure_approtect CONFIG_NRF_SECURE_APPROTECT_USER_HANDLING)
+    elseif(SB_CONFIG_SECURE_APPROTECT_DISABLE)
+      set(secure_approtect CONFIG_NRF_SECURE_APPROTECT_DISABLE)
     endif()
 
     if(SB_CONFIG_SUPPORT_NETCORE AND NOT SB_CONFIG_NETCORE_NONE)

sysbuild/Kconfig.approtect

@@ -4,14 +4,21 @@
 
 choice APPROTECT_HANDLING
 	prompt "APPROTECT handling"
-	depends on SOC_SERIES_NRF52X || SOC_SERIES_NRF53X || SOC_SERIES_NRF91X
+	depends on SOC_SERIES_NRF52X || SOC_SERIES_NRF53X || SOC_SERIES_NRF54LX || SOC_SERIES_NRF91X
 	default APPROTECT_NO_SYSBUILD
 	help
 	  Specifies how the SystemInit() function of all the images should
 	  handle the APPROTECT mechanism.
 
+config APPROTECT_DISABLE
+	bool "Disable"
+	depends on SOC_SERIES_NRF54LX
+	help
+	  Enable CONFIG_NRF_APPROTECT_DISABLE in all images.
+
 config APPROTECT_USE_UICR
 	bool "Use UICR"
+	depends on SOC_SERIES_NRF52X || SOC_SERIES_NRF53X || SOC_SERIES_NRF91X
 	help
 	  Enable CONFIG_NRF_APPROTECT_USE_UICR in all images.
 
@@ -35,14 +42,21 @@ endchoice
 
 choice SECURE_APPROTECT_HANDLING
 	prompt "Secure APPROTECT handling"
-	depends on SOC_NRF5340_CPUAPP || SOC_SERIES_NRF91X
+	depends on SOC_NRF5340_CPUAPP || SOC_SERIES_NRF54LX || SOC_SERIES_NRF91X
 	default SECURE_APPROTECT_NO_SYSBUILD
 	help
 	  Specifies how the SystemInit() function of all the images should
 	  handle the secure APPROTECT mechanism.
 
+config SECURE_APPROTECT_DISABLE
+	bool "Disable"
+	depends on SOC_SERIES_NRF54LX
+	help
+	  Enable CONFIG_NRF_SECURE_APPROTECT_DISABLE in all images.
+
 config SECURE_APPROTECT_USE_UICR
 	bool "Use UICR"
+	depends on SOC_NRF5340_CPUAPP || SOC_SERIES_NRF91X
 	help
 	  Enable CONFIG_NRF_SECURE_APPROTECT_USE_UICR in all images.
 
@@ -53,7 +67,6 @@ config SECURE_APPROTECT_LOCK
 
 config SECURE_APPROTECT_USER_HANDLING
 	bool "Allow user handling"
-	depends on !SOC_SERIES_NRF52X
 	help
 	  Enable CONFIG_NRF_SECURE_APPROTECT_USER_HANDLING in all images.