From 1575eb8a56d6d707f398e347cad445a4be9d9019 Mon Sep 17 00:00:00 2001 From: Tomasz Chyrowicz Date: Wed, 31 Jul 2024 16:29:31 +0200 Subject: [PATCH] hel: nrf-regtool: Use sysbuild to merge UICRs Use sysbuild functionalities to merge UICRs with local domain firmware. Ref: NCSDK-NONE Signed-off-by: Tomasz Chyrowicz --- modules/hal_nordic/nrf-regtool/nrf-regtoolConfig.cmake | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/modules/hal_nordic/nrf-regtool/nrf-regtoolConfig.cmake b/modules/hal_nordic/nrf-regtool/nrf-regtoolConfig.cmake index 86c3c2d01b40..0a303e896fe4 100644 --- a/modules/hal_nordic/nrf-regtool/nrf-regtoolConfig.cmake +++ b/modules/hal_nordic/nrf-regtool/nrf-regtoolConfig.cmake @@ -28,14 +28,7 @@ function(nrf_regtool_generate_hex_from_dts peripheral) return() endif() - set(merged_hex_file ${PROJECT_BINARY_DIR}/${merged_hex_name}) - set_property(GLOBAL APPEND PROPERTY extra_post_build_commands - COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/scripts/build/mergehex.py - -o ${merged_hex_file} - ${generated_hex_file} - ${PROJECT_BINARY_DIR}/${KERNEL_HEX_NAME} - ) - set_property(TARGET runners_yaml_props_target PROPERTY hex_file ${merged_hex_file}) + ncs_merge_file(FILES ${generated_hex_file}) endfunction()