Skip to content

Commit bfecfb9

Browse files
committed
trusted-firmware-m: Prepare to generate tfm_merged.bin
When CONFIG_TFM_MCUBOOT_IMAGE_NUMBER is 1, the process to create the final tfm_merged.bin file is more complex. This prepares the content to introduce the generation of tfm_merged.bin for use in FOTA applications. Signed-off-by: BUDKE Gerson Fernando <[email protected]>
1 parent 7f97575 commit bfecfb9

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

modules/trusted-firmware-m/CMakeLists.txt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -567,8 +567,8 @@ if (CONFIG_BUILD_WITH_TFM)
567567
endfunction()
568568

569569
set(MERGED_HEX_FILE ${CMAKE_BINARY_DIR}/zephyr/tfm_merged.hex)
570-
set(S_NS_HEX_FILE ${CMAKE_BINARY_DIR}/zephyr/tfm_s_zephyr_ns.hex)
571-
set(S_NS_SIGNED_HEX_FILE ${CMAKE_BINARY_DIR}/zephyr/tfm_s_zephyr_ns_signed.hex)
570+
set(S_NS_CONFIRMED_HEX_FILE ${CMAKE_BINARY_DIR}/zephyr/tfm_s_zephyr_ns_confirmed.hex)
571+
set(S_NS_SIGNED_CONFIRMED_HEX_FILE ${CMAKE_BINARY_DIR}/zephyr/tfm_s_zephyr_ns_confirmed_signed.hex)
572572
set(NS_SIGNED_HEX_FILE ${CMAKE_BINARY_DIR}/zephyr/zephyr_ns_signed.hex)
573573
set(S_SIGNED_HEX_FILE ${CMAKE_BINARY_DIR}/zephyr/tfm_s_signed.hex)
574574
set(NS_SIGNED_BIN_FILE ${CMAKE_BINARY_DIR}/zephyr/zephyr_ns_signed.bin)
@@ -598,28 +598,28 @@ if (CONFIG_BUILD_WITH_TFM)
598598
)
599599

600600
elseif(CONFIG_TFM_MCUBOOT_IMAGE_NUMBER STREQUAL "1")
601-
tfm_sign(sign_cmd_s_ns_hex SUFFIX "S_NS"
601+
tfm_sign(sign_cmd_s_ns_confirm_hex SUFFIX "S_NS"
602602
HEADER TRAILER CONFIRM MAX_SECTORS ${S_NS_MAX_SECTORS}
603-
INPUT_FILE ${S_NS_HEX_FILE} OUTPUT_FILE ${S_NS_SIGNED_HEX_FILE})
603+
INPUT_FILE ${S_NS_CONFIRMED_HEX_FILE} OUTPUT_FILE ${S_NS_SIGNED_CONFIRMED_HEX_FILE})
604604

605605
set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
606606
COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/scripts/build/mergehex.py
607-
-o ${S_NS_HEX_FILE}
607+
-o ${S_NS_CONFIRMED_HEX_FILE}
608608
$<TARGET_PROPERTY:tfm,TFM_S_HEX_FILE>
609609
${NS_HEX_APP_FILE}
610610

611-
COMMAND ${sign_cmd_s_ns_hex}
611+
COMMAND ${sign_cmd_s_ns_confirm_hex}
612612

613613
COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/scripts/build/mergehex.py
614614
-o ${MERGED_HEX_FILE}
615615
$<$<BOOL:${CONFIG_TFM_BL1}>:$<TARGET_PROPERTY:tfm,BL2_SIGNED_HEX_FILE>>
616616
$<$<NOT:$<BOOL:${CONFIG_TFM_BL1}>>:$<TARGET_PROPERTY:tfm,BL2_HEX_FILE>>
617-
${S_NS_SIGNED_HEX_FILE}
617+
${S_NS_SIGNED_CONFIRMED_HEX_FILE}
618618
)
619619

620620
set_property(GLOBAL APPEND PROPERTY extra_post_build_byproducts
621-
${S_NS_HEX_FILE}
622-
${S_NS_SIGNED_HEX_FILE}
621+
${S_NS_CONFIRMED_HEX_FILE}
622+
${S_NS_SIGNED_CONFIRMED_HEX_FILE}
623623
${MERGED_HEX_FILE}
624624
)
625625

0 commit comments

Comments
 (0)