bartoszek/zephyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,094 Commits 3 Branches 0 Tags 1.5 GiB
2072fbdaf8
Commit Graph

2 Commits

Author SHA1 Message Date
Sebastian Bøe
6d8d4442b0 mergehex: Improve the error feedback when merged hex files overlap 
When merging hex files, and there is an overlap between the hex files,
display the hex file that failed to merge.

Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>
 2019-01-29 17:04:42 +01:00
Håkon Øye Amundsen
81c6662d23 cmake: flash: scripts: Include externally built hex files 
Allow user to add externally built hex files to the cmake property
HEX_FILES_TO_MERGE. The hex files in this list will be merged
with the hex file generated when building the zephyr application.

This allows users to leverage the application configuration
available in Kconfig and CMake to help decide what hex file
should be merged with the zephyr application.

Signed-off-by: Håkon Øye Amundsen <haakon.amundsen@nordicsemi.no>
 2018-12-04 19:04:13 +01:00