michaelh/zephyr
1
0
Fork 0
Code Releases Activity

scripts: move mergehex.py to scripts/build

Browse source 
Move scripts needed by the build system and not designed to be run
individually or standalone into the build subfolder.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2022-07-11 10:55:37 -04:00 • committed by Carles Cufí
commit 72e7fa8176
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -1791,7 +1791,7 @@ if(HEX_FILES_TO_MERGE)
OUTPUT ${MERGED_HEX_NAME} OUTPUT ${MERGED_HEX_NAME}
COMMAND COMMAND
${PYTHON_EXECUTABLE} ${PYTHON_EXECUTABLE}
${ZEPHYR_BASE}/scripts/mergehex.py ${ZEPHYR_BASE}/scripts/build/mergehex.py
-o ${MERGED_HEX_NAME} -o ${MERGED_HEX_NAME}
${HEX_FILES_TO_MERGE} ${HEX_FILES_TO_MERGE}
DEPENDS ${HEX_FILES_TO_MERGE} ${logical_target_for_zephyr_elf} DEPENDS ${HEX_FILES_TO_MERGE} ${logical_target_for_zephyr_elf}

8
modules/trusted-firmware-m/CMakeLists.txt
View file

@ -419,7 +419,7 @@ if (CONFIG_BUILD_WITH_TFM)
if (NOT CONFIG_TFM_BL2) if (NOT CONFIG_TFM_BL2)
# Merge tfm_s and zephyr (NS) image to a single binary. # Merge tfm_s and zephyr (NS) image to a single binary.
set_property(GLOBAL APPEND PROPERTY extra_post_build_commands set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/scripts/mergehex.py COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/scripts/build/mergehex.py
-o ${MERGED_FILE} -o ${MERGED_FILE}
$<TARGET_PROPERTY:tfm,TFM_S_HEX_FILE> $<TARGET_PROPERTY:tfm,TFM_S_HEX_FILE>
${NS_APP_FILE} ${NS_APP_FILE}
@ -433,14 +433,14 @@ if (CONFIG_BUILD_WITH_TFM)
tfm_sign(sign_cmd NS TRUE ${S_NS_FILE} ${S_NS_SIGNED_FILE}) tfm_sign(sign_cmd NS TRUE ${S_NS_FILE} ${S_NS_SIGNED_FILE})
set_property(GLOBAL APPEND PROPERTY extra_post_build_commands set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/scripts/mergehex.py COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/scripts/build/mergehex.py
-o ${S_NS_FILE} -o ${S_NS_FILE}
$<TARGET_PROPERTY:tfm,TFM_S_HEX_FILE> $<TARGET_PROPERTY:tfm,TFM_S_HEX_FILE>
${NS_APP_FILE} ${NS_APP_FILE}
COMMAND ${sign_cmd} COMMAND ${sign_cmd}
COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/scripts/mergehex.py COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/scripts/build/mergehex.py
-o ${MERGED_FILE} -o ${MERGED_FILE}
$<TARGET_PROPERTY:tfm,BL2_HEX_FILE> $<TARGET_PROPERTY:tfm,BL2_HEX_FILE>
${S_NS_SIGNED_FILE} ${S_NS_SIGNED_FILE}
@ -466,7 +466,7 @@ if (CONFIG_BUILD_WITH_TFM)
COMMAND ${sign_cmd_ns} COMMAND ${sign_cmd_ns}
COMMAND ${sign_cmd_s} COMMAND ${sign_cmd_s}
COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/scripts/mergehex.py COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/scripts/build/mergehex.py
-o ${MERGED_FILE} -o ${MERGED_FILE}
$<TARGET_PROPERTY:tfm,BL2_HEX_FILE> $<TARGET_PROPERTY:tfm,BL2_HEX_FILE>
${S_SIGNED_FILE} ${S_SIGNED_FILE}

0
scripts/mergehex.py → scripts/build/mergehex.py
View file