sysbuild: Fix minor issues

Fixes minor issues from ac93ce8.

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

sysbuild/CMakeLists.txt

@@ -492,27 +492,26 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_pre_cmake)
   endif()
 
   foreach(config APPROTECT_USE_UICR APPROTECT_LOCK APPROTECT_USER_HANDLING
-  SECURE_APPROTECT_USE_UICR SECURE_APPROTECT_USER_HANDLING SECURE_APPROTECT_LOCK)
+          SECURE_APPROTECT_USE_UICR SECURE_APPROTECT_USER_HANDLING SECURE_APPROTECT_LOCK)
     if(SB_CONFIG_${config})
-      if(SB_CONFIG_BOOTLOADER_MCUBOOT)
-        set_config_bool(mcuboot CONFIG_NRF_${config} y)
-      endif()
       if(SB_CONFIG_SECURE_BOOT_APPCORE)
         set_config_bool(b0 CONFIG_NRF_${config} y)
       endif()
+      if(SB_CONFIG_BOOTLOADER_MCUBOOT)
+        set_config_bool(mcuboot CONFIG_NRF_${config} y)
+      endif()
       set_config_bool(${DEFAULT_IMAGE} CONFIG_NRF_${config} y)
-    endif()
-  endforeach()
-  if(SB_CONFIG_SUPPORT_NETCORE AND NOT SB_CONFIG_NETCORE_NONE)
-    foreach(config APPROTECT_USE_UICR APPROTECT_LOCK APPROTECT_USER_HANDLING)
-      if(SB_CONFIG_${config})
-        if(SB_CONFIG_SECURE_BOOT_NETCORE)
-          set_config_bool(b0n CONFIG_NRF_${config} y)
+
+      if(SB_CONFIG_SUPPORT_NETCORE AND NOT SB_CONFIG_NETCORE_NONE)
+        if(NOT config MATCHES "^SECURE_")
+          if(SB_CONFIG_SECURE_BOOT_NETCORE)
+            set_config_bool(b0n CONFIG_NRF_${config} y)
+          endif()
+          set_config_bool(${SB_CONFIG_NETCORE_IMAGE_NAME} CONFIG_NRF_${config} y)
         endif()
-        set_config_bool(${SB_CONFIG_NETCORE_IMAGE_NAME} CONFIG_NRF_${config} y)
       endif()
-    endforeach()
-  endif()
+    endif()
+  endforeach()
 
 endfunction(${SYSBUILD_CURRENT_MODULE_NAME}_pre_cmake)
 

sysbuild/Kconfig.approtect

@@ -4,8 +4,7 @@
 
 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_NRF91X
 	default APPROTECT_NO_SYSBUILD
 	help
 	  Specifies how the SystemInit() function of all the images should