sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mcuboot: update mcuboot to support swap using move

Browse Source 
Older versions of mcuboot did not support swap using move and therefore
the build would have failed CONFIG_MCUBOOT_SWAP_USING_MOVE=y.

Newer mcuboot contains initial support of swap using move for NuttX. Also
Makefile was updated to as some bootutil files were removed from mcuboot.

Signed-off-by: Michal Lenc <michallenc@seznam.cz>
This commit is contained in:
Michal Lenc 2023-08-03 09:50:08 +02:00 committed by Xiang Xiao
parent ccd6aec427
commit 95fcece2a5
3 changed files with 34 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
boot/mcuboot/CMakeLists.txt
View File

@ -27,18 +27,18 @@ if(CONFIG_BOOT_MCUBOOT)
DOWNLOAD_NAME "${CONFIG_MCUBOOT_VERSION}.tar.gz" DOWNLOAD_NAME "${CONFIG_MCUBOOT_VERSION}.tar.gz"
DOWNLOAD_DIR ${CMAKE_CURRENT_LIST_DIR} DOWNLOAD_DIR ${CMAKE_CURRENT_LIST_DIR}
URL "https://github.com/mcu-tools/mcuboot/archive/${CONFIG_MCUBOOT_VERSION}.tar.gz" URL "https://github.com/mcu-tools/mcuboot/archive/${CONFIG_MCUBOOT_VERSION}.tar.gz"
SOURCE_DIR SOURCE_DIR
${CMAKE_CURRENT_LIST_DIR}/mcuboot ${CMAKE_CURRENT_LIST_DIR}/mcuboot
BINARY_DIR BINARY_DIR
${CMAKE_BINARY_DIR}/apps/boot/mcuboot/mcuboot ${CMAKE_BINARY_DIR}/apps/boot/mcuboot/mcuboot
CONFIGURE_COMMAND CONFIGURE_COMMAND
"" ""
BUILD_COMMAND BUILD_COMMAND
"" ""
INSTALL_COMMAND INSTALL_COMMAND
"" ""
TEST_COMMAND TEST_COMMAND
"" ""
DOWNLOAD_NO_PROGRESS true DOWNLOAD_NO_PROGRESS true
TIMEOUT 30) TIMEOUT 30)
@ -50,24 +50,21 @@ if(CONFIG_BOOT_MCUBOOT)
endif() endif()
set(SRCS set(SRCS
mcuboot/boot/bootutil/src/boot_record.c mcuboot/boot/bootutil/src/boot_record.c
mcuboot/boot/bootutil/src/bootutil_misc.c mcuboot/boot/bootutil/src/bootutil_misc.c
mcuboot/boot/bootutil/src/bootutil_public.c mcuboot/boot/bootutil/src/bootutil_public.c
mcuboot/boot/bootutil/src/caps.c mcuboot/boot/bootutil/src/caps.c
mcuboot/boot/bootutil/src/encrypted.c mcuboot/boot/bootutil/src/encrypted.c
mcuboot/boot/bootutil/src/fault_injection_hardening.c mcuboot/boot/bootutil/src/fault_injection_hardening.c
mcuboot/boot/bootutil/src/fault_injection_hardening_delay_rng_mbedtls.c mcuboot/boot/bootutil/src/fault_injection_hardening_delay_rng_mbedtls.c
mcuboot/boot/bootutil/src/image_ec.c mcuboot/boot/bootutil/src/image_ed25519.c
mcuboot/boot/bootutil/src/image_ec256.c mcuboot/boot/bootutil/src/image_rsa.c
mcuboot/boot/bootutil/src/image_ed25519.c mcuboot/boot/bootutil/src/image_validate.c
mcuboot/boot/bootutil/src/image_rsa.c mcuboot/boot/bootutil/src/loader.c
mcuboot/boot/bootutil/src/image_validate.c mcuboot/boot/bootutil/src/swap_misc.c
mcuboot/boot/bootutil/src/loader.c mcuboot/boot/bootutil/src/swap_move.c
mcuboot/boot/bootutil/src/swap_misc.c mcuboot/boot/bootutil/src/swap_scratch.c
mcuboot/boot/bootutil/src/swap_move.c mcuboot/boot/bootutil/src/tlv.c)
mcuboot/boot/bootutil/src/swap_scratch.c
mcuboot/boot/bootutil/src/tlv.c
)
list(APPEND SRCS mcuboot/boot/nuttx/src/flash_map_backend/flash_map_backend.c) list(APPEND SRCS mcuboot/boot/nuttx/src/flash_map_backend/flash_map_backend.c)
@ -91,16 +88,18 @@ if(CONFIG_BOOT_MCUBOOT)
endif() endif()
if(CONFIG_MCUBOOT_USE_TINYCRYPT) if(CONFIG_MCUBOOT_USE_TINYCRYPT)
list(APPEND SRCS list(
APPEND
SRCS
mcuboot/ext/tinycrypt/lib/source/aes_encrypt.c mcuboot/ext/tinycrypt/lib/source/aes_encrypt.c
mcuboot/ext/tinycrypt/lib/source/aes_decrypt.c mcuboot/ext/tinycrypt/lib/source/aes_decrypt.c
mcuboot/ext/tinycrypt/lib/source/ctr_mode.c mcuboot/ext/tinycrypt/lib/source/ctr_mode.c
mcuboot/ext/tinycrypt/lib/source/hmac.c mcuboot/ext/tinycrypt/lib/source/hmac.c
mcuboot/ext/tinycrypt/lib/source/ecc_dh.c mcuboot/ext/tinycrypt/lib/source/ecc_dh.c
mcuboot/ext/tinycrypt/lib/source/sha256.c mcuboot/ext/tinycrypt/lib/source/sha256.c
mcuboot/ext/tinycrypt/lib/source/utils.c mcuboot/ext/tinycrypt/lib/source/utils.c)
) target_include_directories(mcuboot
target_include_directories(mcuboot PRIVATE mcuboot/ext/tinycrypt/lib/include) PRIVATE mcuboot/ext/tinycrypt/lib/include)
endif() endif()
target_include_directories(mcuboot PUBLIC mcuboot/boot/nuttx/include) target_include_directories(mcuboot PUBLIC mcuboot/boot/nuttx/include)

2
boot/mcuboot/Kconfig
View File

@ -14,7 +14,7 @@ if BOOT_MCUBOOT
config MCUBOOT_VERSION config MCUBOOT_VERSION
string "MCUboot version" string "MCUboot version"
default "36bac4f6a54a3b76266444d8c6c177b8b0483a05" default "fefc398cc13ebbc527e297fe9df78cd98a359d75"
config MCUBOOT_ENABLE_LOGGING config MCUBOOT_ENABLE_LOGGING
bool "Enable MCUboot logging" bool "Enable MCUboot logging"

2
boot/mcuboot/Makefile
View File

@ -47,8 +47,6 @@ CSRCS := $(MCUBOOT_UNPACK)/boot/bootutil/src/boot_record.c \
$(MCUBOOT_UNPACK)/boot/bootutil/src/encrypted.c \ $(MCUBOOT_UNPACK)/boot/bootutil/src/encrypted.c \
$(MCUBOOT_UNPACK)/boot/bootutil/src/fault_injection_hardening.c \ $(MCUBOOT_UNPACK)/boot/bootutil/src/fault_injection_hardening.c \
$(MCUBOOT_UNPACK)/boot/bootutil/src/fault_injection_hardening_delay_rng_mbedtls.c \ $(MCUBOOT_UNPACK)/boot/bootutil/src/fault_injection_hardening_delay_rng_mbedtls.c \
$(MCUBOOT_UNPACK)/boot/bootutil/src/image_ec.c \
$(MCUBOOT_UNPACK)/boot/bootutil/src/image_ec256.c \
$(MCUBOOT_UNPACK)/boot/bootutil/src/image_ed25519.c \ $(MCUBOOT_UNPACK)/boot/bootutil/src/image_ed25519.c \
$(MCUBOOT_UNPACK)/boot/bootutil/src/image_rsa.c \ $(MCUBOOT_UNPACK)/boot/bootutil/src/image_rsa.c \
$(MCUBOOT_UNPACK)/boot/bootutil/src/image_validate.c \ $(MCUBOOT_UNPACK)/boot/bootutil/src/image_validate.c \