diff options
author | David Vincze <david.vincze@arm.com> | 2019-10-29 16:09:51 +0100 |
---|---|---|
committer | Tamas Ban <tamas.ban@arm.com> | 2019-12-16 13:39:25 +0000 |
commit | cea8b590ae9ac656a6c8273c53986ff017152673 (patch) | |
tree | 970f20e94ef0ceb32ae2ed112f5bb997102adb38 /CommonConfig.cmake | |
parent | f200ee64282b57cfbaaeaaa0942f801a92f7ce23 (diff) | |
download | trusted-firmware-m-cea8b590ae9ac656a6c8273c53986ff017152673.tar.gz |
Boot: Synchronize MCUBoot code base
Perform a partial synchronization between the MCUBoot files in TF-M
and in the original repository. The hash of the source commit in the
original repository: 4f0ea747c314547daa6b6299ccbd77ae4dee6758.
Main changes:
- Remove current_image global variable and make it part
of the boot state struct
- Update routines to receive the boot state by parameter
- Refactor dependency check functions
- Reorganize the flash map and related files
- Fix swap status control
Change-Id: Ibe948792b306e96282fb82447bb3f05a0c6389ef
Signed-off-by: David Vincze <david.vincze@arm.com>
Diffstat (limited to 'CommonConfig.cmake')
-rw-r--r-- | CommonConfig.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CommonConfig.cmake b/CommonConfig.cmake index ae6ff2c6e3..9a45b5ad1a 100644 --- a/CommonConfig.cmake +++ b/CommonConfig.cmake @@ -395,7 +395,7 @@ set_property(CACHE ATTEST_BOOT_INTERFACE PROPERTY STRINGS "INDIVIDUAL_CLAIMS;CBO validate_cache_value(ATTEST_BOOT_INTERFACE) ##Set mbedTLS compiler flags for BL2 bootloader -set(MBEDCRYPTO_C_FLAGS_BL2 "-D__ARM_FEATURE_CMSE=${ARM_FEATURE_CMSE} -D__thumb2__ ${COMMON_COMPILE_FLAGS_STR} -DMBEDTLS_CONFIG_FILE=\\\\\\\"config-boot.h\\\\\\\" -I${CMAKE_CURRENT_LIST_DIR}/bl2/ext/mcuboot/include") +set(MBEDCRYPTO_C_FLAGS_BL2 "-D__ARM_FEATURE_CMSE=${ARM_FEATURE_CMSE} -D__thumb2__ ${COMMON_COMPILE_FLAGS_STR} -DMBEDTLS_CONFIG_FILE=\\\\\\\"config-rsa.h\\\\\\\" -I${CMAKE_CURRENT_LIST_DIR}/bl2/ext/mcuboot/include") if (MCUBOOT_SIGNATURE_TYPE STREQUAL "RSA-3072") string(APPEND MBEDCRYPTO_C_FLAGS_BL2 " -DMCUBOOT_SIGN_RSA_LEN=3072") endif() |