Browse Source

soc: silabs: siwx91x: Clean output names

The siwx91x need a specific firmware image format. These image end with
.rps extension. The current name of the image is zephyr.bin.rps. However,
the .bin suffix is not relevant. It makes even more sense if we consider
the output of west sign: zephyr.signed.bin.rps. We can simplify these name
by remove the .bin suffix.

Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
pull/92320/head
Jérôme Pouiller 2 weeks ago committed by Daniel DeGrasse
parent
commit
ca9650134f
  1. 4
      scripts/west_commands/sign.py
  2. 6
      soc/silabs/silabs_siwx91x/CMakeLists.txt

4
scripts/west_commands/sign.py

@ -685,8 +685,8 @@ class CommanderSigner(Signer): @@ -685,8 +685,8 @@ class CommanderSigner(Signer):
def get_input_output(command, build_dir, build_conf):
kernel_prefix = (pathlib.Path(build_dir) / 'zephyr' /
build_conf.get('CONFIG_KERNEL_BIN_NAME', "zephyr"))
in_file = f'{kernel_prefix}.bin.rps'
out_file = command.args.sbin or f'{kernel_prefix}.signed.bin.rps'
in_file = f'{kernel_prefix}.rps'
out_file = command.args.sbin or f'{kernel_prefix}.signed.rps'
return (in_file, out_file)
def sign(self, command, build_dir, build_conf, formats):

6
soc/silabs/silabs_siwx91x/CMakeLists.txt

@ -11,7 +11,7 @@ set_property(GLOBAL APPEND PROPERTY extra_post_build_commands @@ -11,7 +11,7 @@ set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/siwx91x_isp_prepare.py
--load-addr ${FLASH_LOAD_ADDRESS}
${KERNEL_BIN_NAME}
${KERNEL_BIN_NAME}.rps
${KERNEL_NAME}.rps
)
# runners_yaml_props_target controls the file used by "west flash"
@ -21,10 +21,10 @@ if(CONFIG_SIWX91X_SIGN_KEY OR CONFIG_SIWX91X_MIC_KEY) @@ -21,10 +21,10 @@ if(CONFIG_SIWX91X_SIGN_KEY OR CONFIG_SIWX91X_MIC_KEY)
${WEST} sign -t silabs_commander --build-dir ${CMAKE_BINARY_DIR}
)
set_target_properties(runners_yaml_props_target
PROPERTIES bin_file ${PROJECT_BINARY_DIR}/${KERNEL_NAME}.signed.bin.rps
PROPERTIES bin_file ${PROJECT_BINARY_DIR}/${KERNEL_NAME}.signed.rps
)
else()
set_target_properties(runners_yaml_props_target
PROPERTIES bin_file ${PROJECT_BINARY_DIR}/${KERNEL_BIN_NAME}.rps
PROPERTIES bin_file ${PROJECT_BINARY_DIR}/${KERNEL_NAME}.rps
)
endif()

Loading…
Cancel
Save