Skip to content

soc: st: stm32: add '-align' flag for signing tool v2.21.0+ #99721

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+46 −15
Open

soc: st: stm32: add '-align' flag for signing tool v2.21.0+ #99721

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
61 changes: 46 additions & 15 deletions soc/st/stm32/stm32n6x/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
zephyr_include_directories(${ZEPHYR_BASE}/drivers)
zephyr_sources(
soc.c
)
)

zephyr_sources_ifdef(CONFIG_STM32N6_NPU
npu/npu_stm32n6.c
)
)

zephyr_include_directories(.)

Expand All @@ -22,26 +22,57 @@ zephyr_linker_sources_ifdef(CONFIG_BOOTLOADER_MCUBOOT SECTIONS ram_check.ld)

if(NOT CONFIG_BOOTLOADER_MCUBOOT)

if(${CMAKE_HOST_SYSTEM_NAME} STREQUAL Windows)
set(SIGNING_TOOL STM32_SigningTool_CLI.exe)
else()
set(SIGNING_TOOL STM32_SigningTool_CLI)
endif()
set(signing_tool STM32_SigningTool_CLI)

find_file(SIGNING_TOOL_FIND ${SIGNING_TOOL})
if(SIGNING_TOOL_FIND STREQUAL SIGNING_TOOL_FIND-NOTFOUND)
# find_program will automatically search for .exe extension on Windows
find_program(signing_tool_find ${signing_tool})
if(signing_tool_find STREQUAL signing_tool_find-NOTFOUND)
message(WARNING "
Signing Image tool (${SIGNING_TOOL}) is not available.
Signed image will not be generated.
You won't be able to run application on the board.
Refer to board documentation for more information")
Signing Image tool (${signing_tool}) is not available.
Signed image will not be generated.
You won't be able to run application on the board.
Refer to board documentation for more information.
")
else()
set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
COMMAND ${SIGNING_TOOL}
message(STATUS "Found STM32 signing tool: ${signing_tool_find}")

execute_process(
COMMAND ${signing_tool_find} --version
OUTPUT_VARIABLE version
RESULT_VARIABLE result
)

set(signing_tool_args
-in ${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.bin
-nk -t fsbl -hv 2.3 --silent
-o ${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.signed.bin
-dump ${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.signed.bin
)

set(signing_tool_version_regex "v([0-9]+[.][0-9]+[.][0-9]+)")
if(result EQUAL 0 AND version MATCHES ${signing_tool_version_regex})
set(signing_tool_version ${CMAKE_MATCH_1})
set(signing_tool_version_min 2.21.0)

if(signing_tool_version VERSION_GREATER_EQUAL signing_tool_version_min)
list(APPEND signing_tool_args -align)

message(STATUS
"${signing_tool} version is v${signing_tool_version}, "
"appending \"-align\" flag to post-build signing command "
"(applicable only with header v2.3 for MCUs, starting from "
"version v${signing_tool_version_min})"
)
endif()
else()
message(FATAL_ERROR "
Unable to determine ${signing_tool} version (expected match to
${signing_tool_version_regex} regex)
")
endif()

set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
COMMAND ${signing_tool} ${signing_tool_args}
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
)

Expand Down