michaelh/zephyr
1
0
Fork 0
Code Releases Activity

module: mcuboot: Add config option to support unsigned binary generation

Browse source 
This commit adds a change to support running west sign command even if
the keyfile is not provided. Default value of the configuration
is set to n in order to maintain backward compatibility.

Signed-off-by: Shubham Kulkarni <shubham.kulkarni@espressif.com>
This commit is contained in:
Shubham Kulkarni 2021-08-30 17:14:49 +05:30 • committed by Christopher Friedt
commit f9eaabbd9b
2 changed files with 22 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Kconfig.zephyr
View file

@ -614,6 +614,7 @@ if BOOTLOADER_MCUBOOT
config MCUBOOT_SIGNATURE_KEY_FILE config MCUBOOT_SIGNATURE_KEY_FILE
string "Path to the mcuboot signing key file" string "Path to the mcuboot signing key file"
default "" default ""
depends on !MCUBOOT_GENERATE_UNSIGNED_IMAGE
help help
The file contains a key pair whose public half is verified The file contains a key pair whose public half is verified
by your target's MCUboot image. The file is in PEM format. by your target's MCUboot image. The file is in PEM format.
@ -672,6 +673,13 @@ config MCUBOOT_EXTRA_IMGTOOL_ARGS
you can use this option to pass extra options to imgtool. you can use this option to pass extra options to imgtool.
For example, you could set this to "--version 1.2". For example, you could set this to "--version 1.2".
config MCUBOOT_GENERATE_UNSIGNED_IMAGE
bool "Generate unsigned binary image bootable with MCUboot"
help
Enabling this configuration allows automatic unsigned binary image
generation when MCUboot signing key is not provided,
i.e., MCUBOOT_SIGNATURE_KEY_FILE is left empty.
config MCUBOOT_GENERATE_CONFIRMED_IMAGE config MCUBOOT_GENERATE_CONFIRMED_IMAGE
bool "Also generate a padded, confirmed image" bool "Also generate a padded, confirmed image"
help help

11
cmake/mcuboot.cmake
View file

@ -20,12 +20,14 @@ function(zephyr_mcuboot_tasks)
set(keyfile "${CONFIG_MCUBOOT_SIGNATURE_KEY_FILE}") set(keyfile "${CONFIG_MCUBOOT_SIGNATURE_KEY_FILE}")
set(keyfile_enc "${CONFIG_MCUBOOT_ENCRYPTION_KEY_FILE}") set(keyfile_enc "${CONFIG_MCUBOOT_ENCRYPTION_KEY_FILE}")
if(NOT "${CONFIG_MCUBOOT_GENERATE_UNSIGNED_IMAGE}")
# Check for misconfiguration. # Check for misconfiguration.
if("${keyfile}" STREQUAL "") if("${keyfile}" STREQUAL "")
# No signature key file, no signed binaries. No error, though: # No signature key file, no signed binaries. No error, though:
# this is the documented behavior. # this is the documented behavior.
return() return()
endif() endif()
endif()
if(NOT WEST) if(NOT WEST)
# This feature requires west. # This feature requires west.
@ -39,7 +41,7 @@ function(zephyr_mcuboot_tasks)
set(${file} "${WEST_TOPDIR}/${${file}}") set(${file} "${WEST_TOPDIR}/${${file}}")
endif() endif()
if(NOT EXISTS "${${file}}") if(NOT EXISTS "${${file}}" AND NOT "${CONFIG_MCUBOOT_GENERATE_UNSIGNED_IMAGE}")
message(FATAL_ERROR "west sign can't find file ${${file}} (Note: Relative paths are relative to the west workspace topdir \"${WEST_TOPDIR}\")") message(FATAL_ERROR "west sign can't find file ${${file}} (Note: Relative paths are relative to the west workspace topdir \"${WEST_TOPDIR}\")")
elseif(NOT (CONFIG_BUILD_OUTPUT_BIN OR CONFIG_BUILD_OUTPUT_HEX)) elseif(NOT (CONFIG_BUILD_OUTPUT_BIN OR CONFIG_BUILD_OUTPUT_HEX))
message(FATAL_ERROR "Can't sign images for MCUboot: Neither CONFIG_BUILD_OUTPUT_BIN nor CONFIG_BUILD_OUTPUT_HEX is enabled, so there's nothing to sign.") message(FATAL_ERROR "Can't sign images for MCUboot: Neither CONFIG_BUILD_OUTPUT_BIN nor CONFIG_BUILD_OUTPUT_HEX is enabled, so there's nothing to sign.")
@ -84,7 +86,12 @@ function(zephyr_mcuboot_tasks)
else() else()
set(imgtool_extra) set(imgtool_extra)
endif() endif()
set(imgtool_args -- --key "${keyfile}" ${imgtool_extra})
if(NOT "${keyfile}" STREQUAL "")
set(imgtool_extra --key "${keyfile}" ${imgtool_extra})
endif()
set(imgtool_args -- ${imgtool_extra})
# Extensionless prefix of any output file. # Extensionless prefix of any output file.
set(output ${ZEPHYR_BINARY_DIR}/${KERNEL_NAME}) set(output ${ZEPHYR_BINARY_DIR}/${KERNEL_NAME})