Skip to content

Commit bff1a47

Browse files
committed
RSE: Disable shallow clone for MCUboot
RSE points to a specific commit of MCUboot on the tfm-2.3.0 feature branch. Disable shallow cloning of MCUboot for RSE as the required commit is not on the default branch and may not be the tip of the feature branch, meaning it might not be included in a shallow clone. Keep shallow cloning enabled by default for other platforms. Signed-off-by: David Vincze <david.vincze@arm.com> Change-Id: I34097692cc6118c47629656bea35b7b205999fbd
1 parent 993fe35 commit bff1a47

3 files changed

Lines changed: 3 additions & 1 deletion

File tree

bl2/ext/mcuboot/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ fetch_remote_library(
1818
GIT_REPOSITORY ${MCUBOOT_GIT_REMOTE}
1919
GIT_TAG ${MCUBOOT_VERSION}
2020
GIT_PROGRESS TRUE
21-
GIT_SHALLOW TRUE
21+
GIT_SHALLOW ${MCUBOOT_GIT_SHALLOW}
2222
GIT_SUBMODULES "docs"
2323
)
2424

config/config_base.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ set(TF_PSA_CRYPTO_GIT_REMOTE "https://github.com/Mbed-TLS/TF-PSA-Cryp
4242
set(MCUBOOT_PATH "DOWNLOAD" CACHE PATH "Path to MCUboot (or DOWNLOAD to fetch automatically")
4343
set(MCUBOOT_VERSION "v2.4.0" CACHE STRING "The version of MCUboot to use")
4444
set(MCUBOOT_GIT_REMOTE "https://github.com/mcu-tools/mcuboot.git" CACHE STRING "The URL to retrieve MCUboot from.")
45+
set(MCUBOOT_GIT_SHALLOW ON CACHE BOOL "Whether to perform a shallow clone of the MCUboot repository")
4546
set(MCUBOOT_PATCH_DIR "${CMAKE_SOURCE_DIR}/lib/ext/mcuboot" CACHE PATH "Path to local folder which contains patches for MCUboot")
4647
set(MCUBOOT_FORCE_PATCH OFF CACHE BOOL "Always apply MCUboot patches")
4748

platform/ext/target/arm/rse/common/config.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ set(RSE_SKU_ENABLED OFF CACHE BOOL "Enable stock keep
127127
######################### BL2 ##################################################
128128

129129
set(MCUBOOT_VERSION "e2a6d0b" CACHE STRING "The version of MCUboot to use")
130+
set(MCUBOOT_GIT_SHALLOW OFF CACHE BOOL "Whether to perform a shallow clone of the MCUboot repository")
130131
set(MCUBOOT_PATCH_DIR "" CACHE PATH "Path to local folder which contains patches for MCUboot")
131132
set(MCUBOOT_IMAGE_NUMBER 4 CACHE STRING "Number of images supported by MCUBoot")
132133
set(MCUBOOT_SIGNATURE_TYPE "EC-P256" CACHE STRING "Algorithm to use for signature validation [RSA-2048, RSA-3072, EC-P256, EC-P384]")

0 commit comments

Comments
 (0)