From c9a2a5e7fb0194bfb168f5aa1a0a83c73f62acb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20=C3=98ye=20Amundsen?= Date: Fri, 3 Jan 2020 08:25:03 +0000 Subject: [PATCH] scripts: cmake: move print from python to cmake MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- CMakeLists.txt | 2 ++ scripts/mergehex.py | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 67e33b5f7b3..5f1361711ae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1479,6 +1479,8 @@ if(HEX_FILES_TO_MERGE) add_custom_target(mergehex ALL DEPENDS ${MERGED_HEX_NAME}) list(APPEND FLASH_DEPS mergehex) + + message(VERBOSE "Merging hex files: ${HEX_FILES_TO_MERGE}") endif() if(EMU_PLATFORM) diff --git a/scripts/mergehex.py b/scripts/mergehex.py index 8dcc7d911ec..aba8b435596 100644 --- a/scripts/mergehex.py +++ b/scripts/mergehex.py @@ -29,8 +29,6 @@ def merge_hex_files(output, input_hex_files, overlap): except AddressOverlapError: raise AddressOverlapError("{} has merge issues".format(hex_file_path)) - print("Merged {}".format(hex_file_path)) - ih.write_hex_file(output)