sysbuild: Add support for matter non-PM factory data generation

Calls the updated factory data function irrespective of partition manager enablement Signed-off-by: Jamie McCrae <[email protected]>
nrfconnect · Nov 19, 2024 · 7fdaf5b · 7fdaf5b
1 parent eaac22b
commit 7fdaf5b
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/sysbuild/CMakeLists.txt b/sysbuild/CMakeLists.txt
@@ -621,18 +621,18 @@ 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()
+
   include_packaging()
   include_suit()
 
   if(SB_CONFIG_SECURE_BOOT OR SB_CONFIG_MCUBOOT_HARDWARE_DOWNGRADE_PREVENTION)
     include_provision_hex()
   endif()
 
-  if(SB_CONFIG_MATTER_FACTORY_DATA_GENERATE AND SB_CONFIG_PARTITION_MANAGER)
-    include(${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconnect/chip-module/generate_factory_data_sysbuild.cmake)
-    nrfconnect_generate_factory_data()
-  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 OR SB_CONFIG_SUIT_MULTI_IMAGE_PACKAGE_BUILD)