michaelh/zephyr
1
0
Fork 0
Code Releases Activity

scripts: cmake: move print from python to cmake

Browse source 
Prior to this all hex files included in a merge would
be printed on every invokation of cmake.

Allow the user to explicitly require this information
by moving the print to a VERBOSE-only cmake message.

Signed-off-by: Håkon Øye Amundsen <haakon.amundsen@nordicsemi.no>
This commit is contained in:
Håkon Øye Amundsen 2020-01-03 08:25:03 +00:00 • committed by Anas Nashif
commit c9a2a5e7fb
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -1479,6 +1479,8 @@ if(HEX_FILES_TO_MERGE)
add_custom_target(mergehex ALL DEPENDS ${MERGED_HEX_NAME}) add_custom_target(mergehex ALL DEPENDS ${MERGED_HEX_NAME})
list(APPEND FLASH_DEPS mergehex) list(APPEND FLASH_DEPS mergehex)
message(VERBOSE "Merging hex files: ${HEX_FILES_TO_MERGE}")
endif() endif()
if(EMU_PLATFORM) if(EMU_PLATFORM)

2
scripts/mergehex.py
View file

@ -29,8 +29,6 @@ def merge_hex_files(output, input_hex_files, overlap):
except AddressOverlapError: except AddressOverlapError:
raise AddressOverlapError("{} has merge issues".format(hex_file_path)) raise AddressOverlapError("{} has merge issues".format(hex_file_path))
print("Merged {}".format(hex_file_path))
ih.write_hex_file(output) ih.write_hex_file(output)