sysbuild: Fix compliance issues with Kconfig

Fixes some issues that the sysbuild Kconfig check has identified

Signed-off-by: Jamie McCrae <[email protected]>

Author: nordicjm

sysbuild/Kconfig.appcore

@@ -12,7 +12,7 @@ config APPCORE_REMOTE_BOARD_TARGET_CPUCLUSTER
 
 config APPCORE_REMOTE_DOMAIN
 	string
-	default "CPUAPP" if APPCORE_REMOTE_BOARD_NAME != ""
+	default "CPUAPP" if APPCORE_REMOTE_BOARD_TARGET_CPUCLUSTER != ""
 
 menu "Application core configuration"
 	depends on SUPPORT_APPCORE
@@ -33,9 +33,9 @@ config NRF_DEFAULT_REMOTE_SHELL
 
 choice APPCORE
 	prompt "Appcore image"
-	default APPCORE_REMOTE_SHELL if NRF_DEFAULT_REMOTE_SHELL && APPCORE_REMOTE_BOARD_NAME != ""
-	default APPCORE_EMPTY if NRF_DEFAULT_EMPTY && APPCORE_REMOTE_BOARD_NAME != ""
-	depends on SUPPORT_APPCORE && !EXTERNAL_CONFIGURED_APPCORE
+	default APPCORE_REMOTE_SHELL if NRF_DEFAULT_REMOTE_SHELL
+	default APPCORE_EMPTY if NRF_DEFAULT_EMPTY
+	depends on SUPPORT_APPCORE
 
 config APPCORE_NONE
 	bool "None"
@@ -72,14 +72,6 @@ config APPCORE_IMAGE_PATH
 	help
 	  Source directory of appcore image.
 
-config APPCORE_IMAGE_BOARD
-	string
-	default APPCORE_REMOTE_BOARD_NAME
-	depends on APPCORE_EMPTY
-	help
-	  Remote board when building this sample.
-	  If not set, the board given to sysbuild is used.
-
 config APPCORE_IMAGE_DOMAIN
 	string
 	default APPCORE_REMOTE_DOMAIN

sysbuild/Kconfig.netcore

@@ -2,10 +2,13 @@
 #
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 
+# Zephyr Kconfig for some samples
+config NET_CORE_IMAGE_HCI_IPC
+	bool
+
 config EXTERNAL_CONFIGURED_NETCORE
 	bool
 	default y
-	select NETCORE_REMOTE_NRF5340_CPUNET if NET_CORE_BOARD = "nrf5340dk/nrf5340/cpunet"
 	depends on NET_CORE_IMAGE_HCI_IPC # Zephyr Kconfig enabling HCI IPC on netcore
 
 config SUPPORT_NETCORE

sysbuild/Kconfig.secureboot

@@ -278,11 +278,9 @@ choice SECURE_BOOT_SIGNING
 
 config SECURE_BOOT_SIGNING_PYTHON
 	bool "Sign with Python ecdsa library"
-	select SECURE_BOOT_PRIVATE_KEY_PROVIDED
 
 config SECURE_BOOT_SIGNING_OPENSSL
 	bool "Sign with openssl command line tool"
-	select SECURE_BOOT_PRIVATE_KEY_PROVIDED
 
 config SECURE_BOOT_SIGNING_CUSTOM
 	bool "Sign with custom command"
@@ -343,7 +341,7 @@ config SECURE_BOOT_PUBLIC_KEY_FILES
 
 config SUPPORT_SECURE_BOOT_BOOTCONF_LOCK_WRITES
 	bool
-	depends on !FPROTECT_ALLOW_COMBINED_REGIONS
+	depends on !MCUBOOT_FPROTECT_ALLOW_COMBINED_REGIONS
 	default y if SOC_NRF54L15_CPUAPP
 
 config SECURE_BOOT_BOOTCONF_LOCK_WRITES
@@ -354,7 +352,6 @@ config SECURE_BOOT_BOOTCONF_LOCK_WRITES
 
 config SECURE_BOOT_DEBUG_SIGNATURE_PUBLIC_KEY_LAST
 	bool "[DEBUG] Place signing public key last"
-	default n
 	help
 	  Place the public key used for signing last in the list instead of first. This is meant to
 	  be used for testing looping through the public keys.

sysbuild/Kconfig.xip

@@ -8,7 +8,7 @@ config SUPPORT_QSPI_XIP
 	default y if SOC_NRF5340_CPUAPP
 	default y if SOC_SERIES_NRF91X
 
-menuconfig QSPI_XIP_SPLIT_IMAGE
+config QSPI_XIP_SPLIT_IMAGE
 	bool "QSPI XIP split image"
 	depends on SUPPORT_QSPI_XIP && BOOTLOADER_MCUBOOT && PARTITION_MANAGER
 	depends on PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY