Skip to content

Commit

Permalink
sysbuild: kconfig: Unset shield config value variable
Browse files Browse the repository at this point in the history
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 <[email protected]>
(cherry picked from commit 49f9d8e)
  • Loading branch information
nordicjm authored and jgl-meta committed Jan 9, 2024
1 parent 62e3c7d commit bc7d3dc
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions share/sysbuild/cmake/modules/sysbuild_kconfig.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down

0 comments on commit bc7d3dc

Please sign in to comment.