diff --git a/sysbuild/CMakeLists.txt b/sysbuild/CMakeLists.txt index 89b0c27ede17..68aa5d4c72a0 100644 --- a/sysbuild/CMakeLists.txt +++ b/sysbuild/CMakeLists.txt @@ -402,18 +402,20 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_pre_cmake) set_config_bool(${DEFAULT_IMAGE} CONFIG_WIFI_NRF700X n) endif() - if(SB_CONFIG_MATTER) - set_config_bool(${DEFAULT_IMAGE} CONFIG_CHIP y) + if(SB_CONFIG_ZEPHYR_CONNECTEDHOMEIP_MODULE) + if(SB_CONFIG_MATTER) + set_config_bool(${DEFAULT_IMAGE} CONFIG_CHIP y) - if(SB_CONFIG_MATTER_OTA) - set_config_bool(${DEFAULT_IMAGE} CONFIG_CHIP_OTA_REQUESTOR y) - set_config_bool(${DEFAULT_IMAGE} CONFIG_CHIP_OTA_IMAGE_BUILD y) + if(SB_CONFIG_MATTER_OTA) + set_config_bool(${DEFAULT_IMAGE} CONFIG_CHIP_OTA_REQUESTOR y) + set_config_bool(${DEFAULT_IMAGE} CONFIG_CHIP_OTA_IMAGE_BUILD y) + else() + set_config_bool(${DEFAULT_IMAGE} CONFIG_CHIP_OTA_REQUESTOR n) + set_config_bool(${DEFAULT_IMAGE} CONFIG_CHIP_OTA_IMAGE_BUILD n) + endif() else() - set_config_bool(${DEFAULT_IMAGE} CONFIG_CHIP_OTA_REQUESTOR n) - set_config_bool(${DEFAULT_IMAGE} CONFIG_CHIP_OTA_IMAGE_BUILD n) + set_config_bool(${DEFAULT_IMAGE} CONFIG_CHIP n) endif() - else() - set_config_bool(${DEFAULT_IMAGE} CONFIG_CHIP n) endif() if(SB_CONFIG_SUIT_BUILD_RECOVERY)