From 95fcece2a5e855db18d740009b9a6443beff86ae Mon Sep 17 00:00:00 2001 From: Michal Lenc Date: Thu, 3 Aug 2023 09:50:08 +0200 Subject: [PATCH] mcuboot: update mcuboot to support swap using move 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 --- boot/mcuboot/CMakeLists.txt | 67 ++++++++++++++++++------------------- boot/mcuboot/Kconfig | 2 +- boot/mcuboot/Makefile | 2 -- 3 files changed, 34 insertions(+), 37 deletions(-) diff --git a/boot/mcuboot/CMakeLists.txt b/boot/mcuboot/CMakeLists.txt index 4b0d73d1d..fb858d712 100644 --- a/boot/mcuboot/CMakeLists.txt +++ b/boot/mcuboot/CMakeLists.txt @@ -27,18 +27,18 @@ if(CONFIG_BOOT_MCUBOOT) DOWNLOAD_NAME "${CONFIG_MCUBOOT_VERSION}.tar.gz" DOWNLOAD_DIR ${CMAKE_CURRENT_LIST_DIR} URL "https://github.com/mcu-tools/mcuboot/archive/${CONFIG_MCUBOOT_VERSION}.tar.gz" - SOURCE_DIR - ${CMAKE_CURRENT_LIST_DIR}/mcuboot - BINARY_DIR - ${CMAKE_BINARY_DIR}/apps/boot/mcuboot/mcuboot - CONFIGURE_COMMAND - "" - BUILD_COMMAND - "" - INSTALL_COMMAND - "" - TEST_COMMAND - "" + SOURCE_DIR + ${CMAKE_CURRENT_LIST_DIR}/mcuboot + BINARY_DIR + ${CMAKE_BINARY_DIR}/apps/boot/mcuboot/mcuboot + CONFIGURE_COMMAND + "" + BUILD_COMMAND + "" + INSTALL_COMMAND + "" + TEST_COMMAND + "" DOWNLOAD_NO_PROGRESS true TIMEOUT 30) @@ -50,24 +50,21 @@ if(CONFIG_BOOT_MCUBOOT) endif() set(SRCS - mcuboot/boot/bootutil/src/boot_record.c - mcuboot/boot/bootutil/src/bootutil_misc.c - mcuboot/boot/bootutil/src/bootutil_public.c - mcuboot/boot/bootutil/src/caps.c - mcuboot/boot/bootutil/src/encrypted.c - mcuboot/boot/bootutil/src/fault_injection_hardening.c - mcuboot/boot/bootutil/src/fault_injection_hardening_delay_rng_mbedtls.c - mcuboot/boot/bootutil/src/image_ec.c - mcuboot/boot/bootutil/src/image_ec256.c - mcuboot/boot/bootutil/src/image_ed25519.c - mcuboot/boot/bootutil/src/image_rsa.c - mcuboot/boot/bootutil/src/image_validate.c - mcuboot/boot/bootutil/src/loader.c - mcuboot/boot/bootutil/src/swap_misc.c - mcuboot/boot/bootutil/src/swap_move.c - mcuboot/boot/bootutil/src/swap_scratch.c - mcuboot/boot/bootutil/src/tlv.c - ) + mcuboot/boot/bootutil/src/boot_record.c + mcuboot/boot/bootutil/src/bootutil_misc.c + mcuboot/boot/bootutil/src/bootutil_public.c + mcuboot/boot/bootutil/src/caps.c + mcuboot/boot/bootutil/src/encrypted.c + mcuboot/boot/bootutil/src/fault_injection_hardening.c + mcuboot/boot/bootutil/src/fault_injection_hardening_delay_rng_mbedtls.c + mcuboot/boot/bootutil/src/image_ed25519.c + mcuboot/boot/bootutil/src/image_rsa.c + mcuboot/boot/bootutil/src/image_validate.c + mcuboot/boot/bootutil/src/loader.c + mcuboot/boot/bootutil/src/swap_misc.c + mcuboot/boot/bootutil/src/swap_move.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) @@ -91,16 +88,18 @@ if(CONFIG_BOOT_MCUBOOT) endif() 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_decrypt.c mcuboot/ext/tinycrypt/lib/source/ctr_mode.c mcuboot/ext/tinycrypt/lib/source/hmac.c mcuboot/ext/tinycrypt/lib/source/ecc_dh.c mcuboot/ext/tinycrypt/lib/source/sha256.c - mcuboot/ext/tinycrypt/lib/source/utils.c - ) - target_include_directories(mcuboot PRIVATE mcuboot/ext/tinycrypt/lib/include) + mcuboot/ext/tinycrypt/lib/source/utils.c) + target_include_directories(mcuboot + PRIVATE mcuboot/ext/tinycrypt/lib/include) endif() target_include_directories(mcuboot PUBLIC mcuboot/boot/nuttx/include) diff --git a/boot/mcuboot/Kconfig b/boot/mcuboot/Kconfig index c6dc38061..c09133149 100644 --- a/boot/mcuboot/Kconfig +++ b/boot/mcuboot/Kconfig @@ -14,7 +14,7 @@ if BOOT_MCUBOOT config MCUBOOT_VERSION string "MCUboot version" - default "36bac4f6a54a3b76266444d8c6c177b8b0483a05" + default "fefc398cc13ebbc527e297fe9df78cd98a359d75" config MCUBOOT_ENABLE_LOGGING bool "Enable MCUboot logging" diff --git a/boot/mcuboot/Makefile b/boot/mcuboot/Makefile index 4b2862417..3fbd6c62a 100644 --- a/boot/mcuboot/Makefile +++ b/boot/mcuboot/Makefile @@ -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/fault_injection_hardening.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_rsa.c \ $(MCUBOOT_UNPACK)/boot/bootutil/src/image_validate.c \