From 3d9ad3b65bacb50323ea83d14d89305baa256dbc Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 27 Sep 2022 11:14:32 +0200 Subject: [PATCH] boot/arm-trusted-firmware: Workaround for non-GIT source builds For some reason, the ATF build system does not deem an mv-ddr-marvell archive to be valid unless it versioned using GIT. This is obviously not the case when building from a tarball downloaded from GitHub. Therefore, remove the check. Despite the ominous warning above the removed line, the lack of a .git directory does not seem to have any detrimental effect on the generated artifact - at least not on a Marvell CN9130 build. --- .../v2.7/dont-require-git-repo.patch | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 patches/arm-trusted-firmware/v2.7/dont-require-git-repo.patch diff --git a/patches/arm-trusted-firmware/v2.7/dont-require-git-repo.patch b/patches/arm-trusted-firmware/v2.7/dont-require-git-repo.patch new file mode 100644 index 00000000..fa51403d --- /dev/null +++ b/patches/arm-trusted-firmware/v2.7/dont-require-git-repo.patch @@ -0,0 +1,10 @@ +Index: arm-trusted-firmware-v2.7/plat/marvell/armada/a8k/common/ble/ble.mk +=================================================================== +--- arm-trusted-firmware-v2.7.orig/plat/marvell/armada/a8k/common/ble/ble.mk ++++ arm-trusted-firmware-v2.7/plat/marvell/armada/a8k/common/ble/ble.mk +@@ -31,5 +31,4 @@ $(MV_DDR_LIB): FORCE + # Do not remove! Following checks are required to ensure correct TF-A builds, removing these checks leads to broken TF-A builds + $(if $(value MV_DDR_PATH),,$(error "Platform '$(PLAT)' for BLE requires MV_DDR_PATH. Please set MV_DDR_PATH to point to the right directory")) + $(if $(wildcard $(value MV_DDR_PATH)/*),,$(error "'MV_DDR_PATH=$(value MV_DDR_PATH)' was specified, but '$(value MV_DDR_PATH)' directory does not exist")) +- $(if $(shell git -C $(value MV_DDR_PATH) rev-parse --show-cdup 2>&1),$(error "'MV_DDR_PATH=$(value MV_DDR_PATH)' was specified, but '$(value MV_DDR_PATH)' does not contain valid mv-ddr-marvell git repository")) + @+make -C $(MV_DDR_PATH) --no-print-directory PLAT_INCLUDES="$(MV_DDR_INCLUDES)" PLATFORM=$(PLAT) ARCH=AARCH64 OBJ_DIR=$(BUILD_PLAT)/ble