From 903a63575e872918ee92e208cbf195e06a4e1b81 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Thu, 14 Dec 2023 09:41:03 +0000 Subject: [PATCH] sysbuild: kconfig: Unset shield config value variable Fixes an issue with shields that have Kconfig file fragments when being used with sysbuild, they would be loaded into sysbuild itself which would then fail because it does not have the Kconfig tree that zephyr applications have Signed-off-by: Jamie McCrae (cherry picked from commit 49f9d8e19c29bd5661bfb5e49c0a4c04871eb054) --- share/sysbuild/cmake/modules/sysbuild_kconfig.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/share/sysbuild/cmake/modules/sysbuild_kconfig.cmake b/share/sysbuild/cmake/modules/sysbuild_kconfig.cmake index 12ab32e55c28..23932d4494f2 100644 --- a/share/sysbuild/cmake/modules/sysbuild_kconfig.cmake +++ b/share/sysbuild/cmake/modules/sysbuild_kconfig.cmake @@ -67,6 +67,9 @@ if(DEFINED BOARD_REVISION) set(BOARD_REVISION_CONFIG "${CMAKE_CURRENT_BINARY_DIR}/empty.conf") endif() +# Unset shield configuration files if set to prevent including in sysbuild +set(shield_conf_files) + list(APPEND ZEPHYR_KCONFIG_MODULES_DIR BOARD=${BOARD}) set(KCONFIG_NAMESPACE SB_CONFIG)