Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[nrf noup] Use ncs merge file function #463

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Loading