sysbuild: only force chip settings when chip Zephyr module is present

Sysbuild controls configuration for images, however some Kconfig settings, like CHIP related ones, are only present when the CHIP project is included by the manifest. Safeguard the force Kconfig settings to only be written when CHIP project is present. Jira: NCSDK-28274 Signed-off-by: Torsten Rasmussen <[email protected]>
nrfconnect · Jul 3, 2024 · a2d816c · a2d816c
1 parent 762435c
commit a2d816c
Showing 1 changed file with 11 additions and 9 deletions.
diff --git 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)