From 76567d8904da88951dc570e327384aa4db11ca2a Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Tue, 16 Jul 2024 09:36:33 +0100 Subject: [PATCH] [nrf noup] Use ncs merge file function Uses the newly added merge hex file function for generating output files when partition manager is not enabled Signed-off-by: Jamie McCrae --- .../generate_factory_data_sysbuild.cmake | 20 +------------------ 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/config/nrfconnect/chip-module/generate_factory_data_sysbuild.cmake b/config/nrfconnect/chip-module/generate_factory_data_sysbuild.cmake index ff37a5f57e..f4c67c67b3 100644 --- a/config/nrfconnect/chip-module/generate_factory_data_sysbuild.cmake +++ b/config/nrfconnect/chip-module/generate_factory_data_sysbuild.cmake @@ -225,25 +225,7 @@ function(nrfconnect_generate_factory_data) set_property(GLOBAL PROPERTY factory_data_PM_HEX_FILE ${OUTPUT_FILE_PATH}/factory_data.hex) set_property(GLOBAL PROPERTY factory_data_PM_TARGET factory_data) else() - add_custom_command(OUTPUT ${OUTPUT_FILE_PATH}/merged.hex - COMMAND - ${PYTHON_EXECUTABLE} - ${ZEPHYR_BASE}/scripts/build/mergehex.py - -o ${OUTPUT_FILE_PATH}/merged.hex - ${OUTPUT_FILE_PATH}/factory_data.hex - ${OUTPUT_FILE_PATH}/zephyr.hex - DEPENDS - ${DEFAULT_IMAGE}_extra_byproducts - factory_data - ${OUTPUT_FILE_PATH}/factory_data.hex - ${OUTPUT_FILE_PATH}/zephyr.hex - ) - - # Wrapper target for the merge command. - add_custom_target(merged_hex - ALL DEPENDS - ${OUTPUT_FILE_PATH}/merged.hex - ) + ncs_merge_file(FILES ${OUTPUT_FILE_PATH}/factory_data.hex DOMAIN cpuapp DEPENDENCIES factory_data) endif() endif() endfunction()