From 513e2d24d34a6429d3cb660c3d936f8d643d5337 Mon Sep 17 00:00:00 2001 From: Grzegorz Swiderski Date: Mon, 17 Feb 2025 12:03:50 +0100 Subject: [PATCH] sysbuild: Clean up Kconfig symbols Unused: * APPCORE_IMAGE_BOARD Undefined: * APPCORE_REMOTE_BOARD_NAME * EXTERNAL_CONFIGURED_APPCORE * NETCORE_REMOTE_NRF5340_CPUNET * SECURE_BOOT_PRIVATE_KEY_PROVIDED * SECURE_BOOT_SIGNATURE_TYPE_ED25519 Pointless menuconfig: * QSPI_XIP_SPLIT_IMAGE Special case: * NET_CORE_IMAGE_HCI_IPC Signed-off-by: Grzegorz Swiderski --- sysbuild/Kconfig.appcore | 16 ++++------------ sysbuild/Kconfig.cracen | 2 +- sysbuild/Kconfig.netcore | 9 +++++++-- sysbuild/Kconfig.secureboot | 2 -- sysbuild/Kconfig.xip | 2 +- 5 files changed, 13 insertions(+), 18 deletions(-) diff --git a/sysbuild/Kconfig.appcore b/sysbuild/Kconfig.appcore index a59ffeda2bd1..c844be9e4d63 100644 --- a/sysbuild/Kconfig.appcore +++ b/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" 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 diff --git a/sysbuild/Kconfig.cracen b/sysbuild/Kconfig.cracen index 7c65ebe2cb62..218b444ac4b6 100644 --- a/sysbuild/Kconfig.cracen +++ b/sysbuild/Kconfig.cracen @@ -14,7 +14,7 @@ menu "CRACEN" config CRACEN_MICROCODE_LOAD_B0 bool - depends on SECURE_BOOT_APPCORE && SECURE_BOOT_SIGNATURE_TYPE_ED25519 + depends on SECURE_BOOT_APPCORE default y help Hidden symbol indicating if b0 is using CRACEN. diff --git a/sysbuild/Kconfig.netcore b/sysbuild/Kconfig.netcore index bc2e8b5f9072..edc263144f94 100644 --- a/sysbuild/Kconfig.netcore +++ b/sysbuild/Kconfig.netcore @@ -2,11 +2,16 @@ # # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +config NET_CORE_IMAGE_HCI_IPC + bool + help + Common symbol enabling HCI IPC on netcore. + Only defined in Zephyr samples and tests. + 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 + depends on NET_CORE_IMAGE_HCI_IPC config SUPPORT_NETCORE bool diff --git a/sysbuild/Kconfig.secureboot b/sysbuild/Kconfig.secureboot index b1476209836e..4b05b8f68ffe 100644 --- a/sysbuild/Kconfig.secureboot +++ b/sysbuild/Kconfig.secureboot @@ -46,11 +46,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" diff --git a/sysbuild/Kconfig.xip b/sysbuild/Kconfig.xip index 8f3852e57c83..42566b46c8ca 100644 --- a/sysbuild/Kconfig.xip +++ b/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