Skip to content

modules: tf-m: rework output file generation #98730

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.

Sign up for GitHub

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

Merged
merged 6 commits into from
Nov 7, 2025
Merged

modules: tf-m: rework output file generation #98730

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
99cbba8
scripts: build: mergehex: fix `--output-bin`
JordanYates Nov 2, 2025
aa5938f
modules: tf-m: fix CMake formatting
JordanYates Nov 2, 2025
a77cf8d
modules: tf-m: remove `S_NS_CONFIRMED_HEX_FILE`
JordanYates Nov 2, 2025
d8ca6cb
modules: tf-m: generate `tfm_s_zephyr_ns_signed.bin`
JordanYates Nov 2, 2025
884e745
modules: tf-m: generate `tfm_merged.bin` from `tfm_merged.hex`
JordanYates Nov 2, 2025
e410e2d
doc: tfm: document output files
JordanYates Nov 5, 2025
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
9 changes: 3 additions & 6 deletions modules/trusted-firmware-m/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,24 +618,21 @@ if(CONFIG_BUILD_WITH_TFM)
$<$<BOOL:${CONFIG_TFM_BL1}>:$<TARGET_PROPERTY:tfm,BL2_SIGNED_HEX_FILE>>
$<$<NOT:$<BOOL:${CONFIG_TFM_BL1}>>:$<TARGET_PROPERTY:tfm,BL2_HEX_FILE>>
${S_NS_SIGNED_CONFIRMED_HEX_FILE}

COMMAND ${CMAKE_OBJCOPY} --input-target=ihex --output-target=binary ${MERGED_HEX_FILE} ${MERGED_BIN_FILE}
Copy link
Contributor

@tejlmand tejlmand Nov 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree that because mergehex already works on the hex files in order to produce the bin binary, then there is no reason for going through an extra mergehex path.

The question regarding bin output depending on hex output, and thus mergehex producing bin output is another (though important) discussion, is something which I don't think belong here.

Thus approving this change.

)

set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
COMMAND ${sign_cmd_s_ns_hex}

COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/scripts/build/mergehex.py
-o ${MERGED_BIN_FILE} --output-bin
$<$<BOOL:${CONFIG_TFM_BL1}>:$<TARGET_PROPERTY:tfm,BL2_SIGNED_HEX_FILE>>
$<$<NOT:$<BOOL:${CONFIG_TFM_BL1}>>:$<TARGET_PROPERTY:tfm,BL2_HEX_FILE>>
${S_NS_SIGNED_HEX_FILE}

COMMAND ${CMAKE_OBJCOPY} --input-target=ihex --output-target=binary ${S_NS_SIGNED_HEX_FILE} ${S_NS_SIGNED_BIN_FILE}
)

set_property(GLOBAL APPEND PROPERTY extra_post_build_byproducts
${S_NS_SIGNED_CONFIRMED_HEX_FILE}
${S_NS_HEX_FILE}
${S_NS_SIGNED_HEX_FILE}
${S_NS_SIGNED_BIN_FILE}
${MERGED_HEX_FILE}
${MERGED_BIN_FILE}
)
Expand Down