Skip to content

Commit d943ae3

Browse files
committed
sysbuild: Disable child image Kconfigs when PM is disabled
Prevents PM being enabled when it should be disabled in zephyr tests by disabling child image Kconfigs that enable the PM Kconfig option Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
1 parent df7e075 commit d943ae3

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

sysbuild/CMakeLists.txt

+10
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,16 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_pre_cmake)
6868
cmake_parse_arguments(PRE_CMAKE "" "" "IMAGES" ${ARGN})
6969
restore_ncs_vars()
7070

71+
if(NOT SB_CONFIG_PARTITION_MANAGER)
72+
# Disable any Kconfigs for child images in the main application
73+
foreach(config NCS_SAMPLE_EMPTY_APP_CORE_CHILD_IMAGE NCS_INCLUDE_RPMSG_CHILD_IMAGE NCS_SAMPLE_REMOTE_SHELL_CHILD_IMAGE
74+
NCS_SAMPLE_DTM_REMOTE_HCI_CHILD_IMAGE NCS_SAMPLE_PERIPHERAL_RADIO_TEST_CHILD_IMAGE B0_BUILD_STRATEGY_USE_HEX_FILE
75+
B0_BUILD_STRATEGY_SKIP_BUILD B0_BUILD_STRATEGY_FROM_SOURCE PM_SINGLE_IMAGE MCUBOOT_BUILD_STRATEGY_USE_HEX_FILE
76+
MCUBOOT_BUILD_STRATEGY_SKIP_BUILD MCUBOOT_BUILD_STRATEGY_FROM_SOURCE)
77+
set_config_bool(${DEFAULT_IMAGE} CONFIG_${config} n)
78+
endforeach()
79+
endif()
80+
7181
foreach(image ${PRE_CMAKE_IMAGES})
7282
if(SB_CONFIG_PARTITION_MANAGER)
7383
set_config_bool(${image} CONFIG_PARTITION_MANAGER_ENABLED y)

0 commit comments

Comments
 (0)