From c8d9f4b70164974fb4ab4523cb3929c38e6f12f0 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Thu, 3 Jul 2025 13:07:05 +0100 Subject: [PATCH] sysbuild: cmake: kconfig: Fix missing sysbuild Kconfig paths Fixes an issue where external sysbuild Kconfig path variables were not provided and meant they could not be overwritten Signed-off-by: Jamie McCrae --- share/sysbuild/cmake/modules/sysbuild_kconfig.cmake | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/share/sysbuild/cmake/modules/sysbuild_kconfig.cmake b/share/sysbuild/cmake/modules/sysbuild_kconfig.cmake index f366c66dbde..f0e4c29fcad 100644 --- a/share/sysbuild/cmake/modules/sysbuild_kconfig.cmake +++ b/share/sysbuild/cmake/modules/sysbuild_kconfig.cmake @@ -102,6 +102,17 @@ set(shield_conf_files) list(APPEND ZEPHYR_KCONFIG_MODULES_DIR BOARD=${BOARD}) set(KCONFIG_NAMESPACE SB_CONFIG) +foreach(module_name ${ZEPHYR_MODULE_NAMES}) + zephyr_string(SANITIZE TOUPPER MODULE_NAME_UPPER ${module_name}) + + if(SYSBUILD_${MODULE_NAME_UPPER}_KCONFIG) + list(APPEND + ZEPHYR_KCONFIG_MODULES_DIR + "SYSBUILD_${MODULE_NAME_UPPER}_KCONFIG=${SYSBUILD_${MODULE_NAME_UPPER}_KCONFIG}" + ) + endif() +endforeach() + if(EXISTS ${APP_DIR}/Kconfig.sysbuild) set(KCONFIG_ROOT ${APP_DIR}/Kconfig.sysbuild) endif()