sysbuild: Align Matter to non-PM builds

Added matter.cmake to use image flasher for generating
factory data. Aligned CMakeLists.txt with changes in Matter SDK.

Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>

Author: ArekBalysNordic

sysbuild/CMakeLists.txt

@@ -987,11 +987,6 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_post_cmake)
     include(${ZEPHYR_NRF_MODULE_DIR}/cmake/sysbuild/fast_pair/hex.cmake)
   endif()
 
-  if(SB_CONFIG_MATTER_FACTORY_DATA_GENERATE)
-    include(${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconnect/chip-module/generate_factory_data_sysbuild.cmake)
-    nrfconnect_generate_factory_data()
-  endif()
-
   # Sign extra DFU images added via dfu_extra_add_binary()
   if(SB_CONFIG_MCUBOOT_EXTRA_IMAGES)
     include(${ZEPHYR_NRF_MODULE_DIR}/cmake/sysbuild/image_signing_extra.cmake)
@@ -1012,9 +1007,15 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_post_cmake)
     include(${ZEPHYR_NRF_MODULE_DIR}/cmake/sysbuild/generate_default_keyfile.cmake)
   endif()
 
-  if(SB_CONFIG_MATTER_OTA)
-    include(${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/zephyr/ota-image_sysbuild.cmake)
-    if(SB_CONFIG_DFU_MULTI_IMAGE_PACKAGE_BUILD)
+  # Matter related configurations
+  if(SB_CONFIG_ZEPHYR_CONNECTEDHOMEIP_MODULE AND SB_CONFIG_MATTER)
+    if(SB_CONFIG_MATTER_FACTORY_DATA_GENERATE)
+      include(${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconnect/chip-module/generate_factory_data.cmake)
+      nrfconnect_generate_factory_data()
+    endif()
+
+    if(SB_CONFIG_MATTER_OTA AND SB_CONFIG_DFU_MULTI_IMAGE_PACKAGE_BUILD)
+      include(${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/zephyr/ota-image_sysbuild.cmake)
       chip_ota_image(chip-ota-image
         INPUT_FILES ${CMAKE_BINARY_DIR}/dfu_multi_image.bin
         OUTPUT_FILE ${CMAKE_BINARY_DIR}/${SB_CONFIG_MATTER_OTA_IMAGE_FILE_NAME}
@@ -1172,5 +1173,6 @@ include(${CMAKE_CURRENT_LIST_DIR}/firmware_loader_installer.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/nrf70.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/dfu_extra_images.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/bt_fast_pair.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/matter.cmake)
 
 store_ncs_vars()

sysbuild/matter.cmake

@@ -0,0 +1,16 @@
+
+#
+# Copyright (c) 2026 Nordic Semiconductor
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+if(SB_CONFIG_ZEPHYR_CONNECTEDHOMEIP_MODULE AND SB_CONFIG_MATTER AND
+  SB_CONFIG_MATTER_FACTORY_DATA_GENERATE AND NOT SB_CONFIG_PARTITION_MANAGER
+)
+  include(image_flasher.cmake)
+  add_image_flasher(
+    NAME matter_factory_data
+    HEX_FILE "${CMAKE_BINARY_DIR}/matter_factory_data/zephyr/factory_data.hex"
+  )
+endif()