Skip to content

Commit 7fdaf5b

Browse files
committed
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]>
1 parent eaac22b commit 7fdaf5b

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

sysbuild/CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -621,18 +621,18 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_post_cmake)
621621
include(${ZEPHYR_NRF_MODULE_DIR}/cmake/sysbuild/fast_pair_hex.cmake)
622622
endif()
623623

624+
if(SB_CONFIG_MATTER_FACTORY_DATA_GENERATE)
625+
include(${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconnect/chip-module/generate_factory_data_sysbuild.cmake)
626+
nrfconnect_generate_factory_data()
627+
endif()
628+
624629
include_packaging()
625630
include_suit()
626631

627632
if(SB_CONFIG_SECURE_BOOT OR SB_CONFIG_MCUBOOT_HARDWARE_DOWNGRADE_PREVENTION)
628633
include_provision_hex()
629634
endif()
630635

631-
if(SB_CONFIG_MATTER_FACTORY_DATA_GENERATE AND SB_CONFIG_PARTITION_MANAGER)
632-
include(${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconnect/chip-module/generate_factory_data_sysbuild.cmake)
633-
nrfconnect_generate_factory_data()
634-
endif()
635-
636636
if(SB_CONFIG_MATTER_OTA)
637637
include(${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/zephyr/ota-image_sysbuild.cmake)
638638
if(SB_CONFIG_DFU_MULTI_IMAGE_PACKAGE_BUILD OR SB_CONFIG_SUIT_MULTI_IMAGE_PACKAGE_BUILD)

0 commit comments

Comments
 (0)