aboutsummaryrefslogtreecommitdiff
path: root/bl2
diff options
context:
space:
mode:
authorBalint Matyi <Balint.Matyi@arm.com>2020-06-09 14:03:47 +0100
committerDavid Vincze <david.vincze@linaro.org>2020-06-24 14:27:49 +0200
commitf0873cd2598c3aab09bbcbd90e153b8444965bdb (patch)
tree845ac03df807b01b544cb66c0d37a7d6d552f63c /bl2
parent67090ea05962937f130f2d082dec67febacc18be (diff)
downloadtrusted-firmware-m-f0873cd2598c3aab09bbcbd90e153b8444965bdb.tar.gz
Boot: Set the default MCUBoot repo to 'UPSTREAM'
Replace the TF-M default bootloader from the TF-M's version of MCUBoot to the original MCUboot project. The fork is intended to be removed in the future. Signed-off-by: Balint Matyi <Balint.Matyi@arm.com> Change-Id: I9c7c55ed6490712f1b24d4f4eb79db4bdbb23b83
Diffstat (limited to 'bl2')
-rw-r--r--bl2/ext/mcuboot/MCUBootConfig.cmake10
1 files changed, 9 insertions, 1 deletions
diff --git a/bl2/ext/mcuboot/MCUBootConfig.cmake b/bl2/ext/mcuboot/MCUBootConfig.cmake
index 06a828b37..ef4246e6a 100644
--- a/bl2/ext/mcuboot/MCUBootConfig.cmake
+++ b/bl2/ext/mcuboot/MCUBootConfig.cmake
@@ -13,7 +13,7 @@ set(BL2 True CACHE BOOL "Configure TF-M to use BL2 and enable building BL2")
if (BL2)
add_definitions(-DBL2)
- set(MCUBOOT_REPO "TF-M" CACHE STRING "Configure which repository use the MCUBoot from")
+ set(MCUBOOT_REPO "UPSTREAM" CACHE STRING "Configure which repository use the MCUBoot from")
set_property(CACHE MCUBOOT_REPO PROPERTY STRINGS "TF-M;UPSTREAM")
validate_cache_value(MCUBOOT_REPO)
@@ -29,6 +29,14 @@ if (BL2)
set_property(CACHE MCUBOOT_SIGNATURE_TYPE PROPERTY STRINGS "RSA-3072;RSA-2048")
validate_cache_value(MCUBOOT_SIGNATURE_TYPE)
+ #FixMe: These checks can be removed when the upgrade strategies in question are upstreamed to the original MCUBoot repo.
+ if (TARGET_PLATFORM STREQUAL "MUSCA_A" OR TARGET_PLATFORM STREQUAL "AN524")
+ if (MCUBOOT_REPO STREQUAL "UPSTREAM")
+ message(WARNING "The 'UPSTREAM' MCUBoot repository cannot be used when building for ${TARGET_PLATFORM}. Your choice was overridden.")
+ endif()
+ set(MCUBOOT_REPO "TF-M")
+ endif()
+
if (MCUBOOT_REPO STREQUAL "TF-M")
set(MCUBOOT_HW_KEY On CACHE BOOL "Configure to use HW key for image verification. Otherwise key is embedded in MCUBoot image.")
else() #Using upstream MCUBoot