File tree Expand file tree Collapse file tree 3 files changed +21
-1
lines changed
Expand file tree Collapse file tree 3 files changed +21
-1
lines changed Original file line number Diff line number Diff line change @@ -928,6 +928,13 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_post_cmake)
928928 endif ()
929929 endif ()
930930
931+ if (SB_CONFIG_ZEPHYR_CONNECTEDHOMEIP_MODULE AND SB_CONFIG_MATTER AND
932+ SB_CONFIG_MATTER_FACTORY_DATA_GENERATE AND NOT SB_CONFIG_PARTITION_MANAGER
933+ )
934+ include (${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR} /config/nrfconnect/chip-module/generate_factory_data.cmake)
935+ nrfconnect_generate_factory_data()
936+ endif ()
937+
931938 if (SB_CONFIG_WIFI_PATCHES_EXT_FLASH_STORE)
932939 include (${ZEPHYR_NRF_MODULE_DIR} /cmake/sysbuild/nrf700x.cmake)
933940 endif ()
@@ -1058,5 +1065,6 @@ include(${CMAKE_CURRENT_LIST_DIR}/radio_loader.cmake)
10581065include (${CMAKE_CURRENT_LIST_DIR} /secureboot.cmake)
10591066include (${CMAKE_CURRENT_LIST_DIR} /mcuboot.cmake)
10601067include (${CMAKE_CURRENT_LIST_DIR} /firmware_loader_radio.cmake)
1068+ include (${CMAKE_CURRENT_LIST_DIR} /matter_factory_data.cmake)
10611069
10621070store_ncs_vars()
Original file line number Diff line number Diff line change @@ -16,7 +16,7 @@ config MATTER_FACTORY_DATA_GENERATE
1616
1717config MATTER_FACTORY_DATA_MERGE_WITH_FIRMWARE
1818 bool "Merge generated factory data with merged.hex output"
19- depends on MATTER_FACTORY_DATA_GENERATE
19+ depends on MATTER_FACTORY_DATA_GENERATE && PARTITION_MANAGER
2020 default y
2121 help
2222 Enables merging the generated factory data with the merged.hex output build file. As a
Original file line number Diff line number Diff line change 1+ #
2+ # Copyright (c) 2025 Nordic Semiconductor
3+ #
4+ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
5+ #
6+
7+ if (SB_CONFIG_ZEPHYR_CONNECTEDHOMEIP_MODULE AND SB_CONFIG_MATTER AND
8+ SB_CONFIG_MATTER_FACTORY_DATA_GENERATE AND NOT SB_CONFIG_PARTITION_MANAGER
9+ )
10+ include (image_flasher.cmake)
11+ add_image_flasher(NAME matter_factory_data HEX_FILE "${CMAKE_BINARY_DIR} /factory_data.hex" )
12+ endif ()
You can’t perform that action at this time.
0 commit comments