Boot: Upgrade MCUBoot to v1.5.0
Modifies cmake to allow building against upstream v1.5.0
MCUBoot, and changes the version number in the documentation.
Change-Id: If572b8607f1d09c6cc4ef922c3749c67cfe37b6c
Signed-off-by: Balint Matyi <Balint.Matyi@arm.com>
diff --git a/bl2/ext/mcuboot/CMakeLists.txt b/bl2/ext/mcuboot/CMakeLists.txt
index 1f19b2a..1997fc1 100644
--- a/bl2/ext/mcuboot/CMakeLists.txt
+++ b/bl2/ext/mcuboot/CMakeLists.txt
@@ -99,6 +99,12 @@
"${TFM_ROOT_DIR}/bl2/src/boot_record.c"
"${TFM_ROOT_DIR}/bl2/src/security_cnt.c"
)
+else()
+ list(APPEND ALL_SRC_C
+ "${MCUBOOT_DIR}/bootutil/src/swap_scratch.c"
+ "${MCUBOOT_DIR}/bootutil/src/swap_move.c"
+ "${MCUBOOT_DIR}/bootutil/src/swap_misc.c"
+ )
endif()
#Define location of Mbed Crypto source, build, and installation directory.
diff --git a/docs/user_guides/tfm_secure_boot.rst b/docs/user_guides/tfm_secure_boot.rst
index b96d4b7..1f4c47e 100644
--- a/docs/user_guides/tfm_secure_boot.rst
+++ b/docs/user_guides/tfm_secure_boot.rst
@@ -281,7 +281,7 @@
must be added to the command line at the CMake configuration step::
cd <TF-M base folder>
- git clone https://github.com/JuulLabs-OSS/mcuboot.git -b v1.4.0
+ git clone https://github.com/JuulLabs-OSS/mcuboot.git -b v1.5.0
cd <TF-M build folder>
cmake -G"Unix Makefiles" -DTARGET_PLATFORM=AN521 -DCOMPILER=ARMCLANG -DMCUBOOT_REPO=UPSTREAM ../