[Buildroot] [PATCH] boot/arm-trusted-firmware: fix the build for macchiatobin
Vincent Stehlé
vincent.stehle at arm.com
Thu Apr 10 12:14:49 UTC 2025
When Building arm-trusted-firmware for the Macchiatobin platform
(a80x0_mcbin), which depends on the mv-ddr-marvell package, the build fails
complaining that this package's folder "does not contain valid
mv-ddr-marvell git repository".
This is expected under Buildroot, where we use intermediate archives.
Add patches to fix the build for this platform, for a few versions of TF-A
(v2.6, v2.7, v2.8, lts-v2.8.20, v2.9, v2.10, lts-v2.10.5, v2.11, v2.12 and
lts-v2.12.1).
Add the corresponding entries to .checkpackageignore, as those patches have
no upstream.
Signed-off-by: Vincent Stehlé <vincent.stehle at arm.com>
Cc: Dick Olsson <hi at senzilla.io>
Cc: Sergey Matyukevich <geomatsi at gmail.com>
---
Hi,
TF-A versions v2.0 to v2.3 cannot build for platform a80x0_mcbin for
other reasons, which is why they are not taken care of in this patch.
Versions v2.4 and v2.5 are already fine and do not need any fix.
For build verification, we have two in-tree defconfigs comprising TF-A,
built for the a80x0_mcbin platform:
solidrun_clearfog_gt_8k solidrun_macchiatobin
Those defconfigs use TF-A version v2.4, which has no build issue.
They could not build e.g. v2.12, though, and this is indeed fixed by
this patch. For the record, I used the following additional configs for
that to spare build time:
BR2_CCACHE=y BR2_PER_PACKAGE_DIRECTORIES=y BR2_TOOLCHAIN_EXTERNAL=y
Any runtime test on board would be welcome!
...this could even allow to "bump" those defconfigs :)
The following python tests were verified to be ok after the change:
tests.boot.test_atf.TestATFAllwinner tests.boot.test_edk2.TestEdk2
tests.boot.test_optee_os.TestOptee tests.package.test_fwts.TestFwts
The following defconfigs can build their TF-A version, before and after
the patch, with the same additional configs as above:
arm_fvp_ebbr avenger96 beagleboneai64 beagleplay beelink_gs1
engicam_px30_core freescale_imx8dxlevk freescale_imx8mmevk
freescale_imx8mnevk freescale_imx8mpevk freescale_imx8mqevk
freescale_imx8qmmek freescale_imx8qxpmek freescale_imx93evk
friendlyarm_nanopi_r2s friendlyarm_nanopi_r3s imx8mm-evk imx8mmpico
imx8mn_bsh_smm_s2 imx8mn_bsh_smm_s2_pro imx8mn-ddr4-evk imx8mp-evk
imx8mqevk imx93-evk kontron_bl_imx8mm kontron_pitx_imx8m ls1028ardb
ls1043a-rdb ls1046a-frwy ls1046a-rdb nitrogen8m nitrogen8mm
nitrogen8mn nitrogen8mp octavo_osd32mp1_brk octavo_osd32mp1_red
olimex_a64_olinuxino orangepi_5_plus orangepi_lite2 orangepi_one_plus
orangepi_pc2 orangepi_zero2w orangepi_zero3 orangepi_zero_plus2
orangepi_zero_plus pine64 pine64_sopine polyhex_debix_model_a
qemu_aarch64_ebbr qemu_aarch64_sbsa qemu_arm_ebbr qemu_arm_vexpress_tz
rock4se rock5b rock64 rockpro64 rockpro64_ebbr roc_pc_rk3399
solidrun_clearfog_gt_8k solidrun_macchiatobin stm32mp135f_dk
stm32mp157a_dk1 stm32mp157c_dk2 stm32mp157c_odyssey ti_am62ax_sk
ti_am62px_sk ti_am62x_sk ti_am64x_sk versal_vck190 versal_vek280
versal_vpk180 zynqmp_kria_kd240 zynqmp_kria_kr260 zynqmp_kria_kv260
zynqmp_zcu102 zynqmp_zcu104 zynqmp_zcu106
The following defconfigs have TF-A but cannot build for other reasons:
kontron_pitx_imx8m orangepi_lite2 orangepi_one_plus stm32mp135f_dk
ti_am62ax_sk ti_am62px_sk
Best regards,
Vincent.
.checkpackageignore | 10 ++++++
...ll-allow-building-with-non-git-mv-dd.patch | 33 +++++++++++++++++++
...ll-allow-building-with-non-git-mv-dd.patch | 33 +++++++++++++++++++
...ll-allow-building-with-non-git-mv-dd.patch | 33 +++++++++++++++++++
...ll-allow-building-with-non-git-mv-dd.patch | 33 +++++++++++++++++++
...ll-allow-building-with-non-git-mv-dd.patch | 33 +++++++++++++++++++
...ll-allow-building-with-non-git-mv-dd.patch | 33 +++++++++++++++++++
...ll-allow-building-with-non-git-mv-dd.patch | 33 +++++++++++++++++++
...ll-allow-building-with-non-git-mv-dd.patch | 33 +++++++++++++++++++
...ll-allow-building-with-non-git-mv-dd.patch | 33 +++++++++++++++++++
...ll-allow-building-with-non-git-mv-dd.patch | 33 +++++++++++++++++++
11 files changed, 340 insertions(+)
create mode 100644 boot/arm-trusted-firmware/lts-v2.10.5/0001-build-plat-marvell-allow-building-with-non-git-mv-dd.patch
create mode 100644 boot/arm-trusted-firmware/lts-v2.12.1/0001-build-plat-marvell-allow-building-with-non-git-mv-dd.patch
create mode 100644 boot/arm-trusted-firmware/lts-v2.8.20/0002-build-plat-marvell-allow-building-with-non-git-mv-dd.patch
create mode 100644 boot/arm-trusted-firmware/v2.10/0001-build-plat-marvell-allow-building-with-non-git-mv-dd.patch
create mode 100644 boot/arm-trusted-firmware/v2.11/0001-build-plat-marvell-allow-building-with-non-git-mv-dd.patch
create mode 100644 boot/arm-trusted-firmware/v2.12/0001-build-plat-marvell-allow-building-with-non-git-mv-dd.patch
create mode 100644 boot/arm-trusted-firmware/v2.6/0002-build-plat-marvell-allow-building-with-non-git-mv-dd.patch
create mode 100644 boot/arm-trusted-firmware/v2.7/0002-build-plat-marvell-allow-building-with-non-git-mv-dd.patch
create mode 100644 boot/arm-trusted-firmware/v2.8/0003-build-plat-marvell-allow-building-with-non-git-mv-dd.patch
create mode 100644 boot/arm-trusted-firmware/v2.9/0002-build-plat-marvell-allow-building-with-non-git-mv-dd.patch
diff --git a/.checkpackageignore b/.checkpackageignore
index 1a61aa1ac0..8a59f12f5e 100644
--- a/.checkpackageignore
+++ b/.checkpackageignore
@@ -85,6 +85,16 @@ board/technologic/ts4900/post-image.sh Shellcheck
board/toradex/apalis-imx6/post-image.sh Shellcheck
board/udoo/common/post-build.sh Shellcheck
boot/afboot-stm32/0003-Makefile-disable-stack-protector.patch lib_patch.Upstream
+boot/arm-trusted-firmware/lts-v2.10.5/0001-build-plat-marvell-allow-building-with-non-git-mv-dd.patch lib_patch.Upstream
+boot/arm-trusted-firmware/lts-v2.12.1/0001-build-plat-marvell-allow-building-with-non-git-mv-dd.patch lib_patch.Upstream
+boot/arm-trusted-firmware/lts-v2.8.20/0002-build-plat-marvell-allow-building-with-non-git-mv-dd.patch lib_patch.Upstream
+boot/arm-trusted-firmware/v2.10/0001-build-plat-marvell-allow-building-with-non-git-mv-dd.patch lib_patch.Upstream
+boot/arm-trusted-firmware/v2.11/0001-build-plat-marvell-allow-building-with-non-git-mv-dd.patch lib_patch.Upstream
+boot/arm-trusted-firmware/v2.12/0001-build-plat-marvell-allow-building-with-non-git-mv-dd.patch lib_patch.Upstream
+boot/arm-trusted-firmware/v2.6/0002-build-plat-marvell-allow-building-with-non-git-mv-dd.patch lib_patch.Upstream
+boot/arm-trusted-firmware/v2.7/0002-build-plat-marvell-allow-building-with-non-git-mv-dd.patch lib_patch.Upstream
+boot/arm-trusted-firmware/v2.8/0003-build-plat-marvell-allow-building-with-non-git-mv-dd.patch lib_patch.Upstream
+boot/arm-trusted-firmware/v2.9/0002-build-plat-marvell-allow-building-with-non-git-mv-dd.patch lib_patch.Upstream
boot/optee-os/3.13.0/0001-core-zlib-fix-build-warning-when-_LFS64_LARGEFILE-is.patch lib_patch.Upstream
boot/syslinux/0001-bios-Fix-alignment-change-with-gcc-5.patch lib_patch.Upstream
boot/syslinux/0002-Disable-PIE-to-avoid-FTBFS-on-amd64.patch lib_patch.Upstream
diff --git a/boot/arm-trusted-firmware/lts-v2.10.5/0001-build-plat-marvell-allow-building-with-non-git-mv-dd.patch b/boot/arm-trusted-firmware/lts-v2.10.5/0001-build-plat-marvell-allow-building-with-non-git-mv-dd.patch
new file mode 100644
index 0000000000..8bb1ed59e1
--- /dev/null
+++ b/boot/arm-trusted-firmware/lts-v2.10.5/0001-build-plat-marvell-allow-building-with-non-git-mv-dd.patch
@@ -0,0 +1,33 @@
+From 70be9272d8d8b8e205fc60b41704d470a6798e36 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= <vincent.stehle at arm.com>
+Date: Tue, 8 Apr 2025 13:27:53 +0200
+Subject: [PATCH] build(plat/marvell): allow building with non-git
+ mv-ddr-marvell
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When the mv-ddr-marvell folder is not a git tree the build fails
+complaining that it "does not contain valid mv-ddr-marvell git
+repository".
+
+Remove this check to allow building in Buildroot.
+
+Signed-off-by: Vincent Stehlé <vincent.stehle at arm.com>
+---
+ plat/marvell/armada/a8k/common/ble/ble.mk | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/plat/marvell/armada/a8k/common/ble/ble.mk b/plat/marvell/armada/a8k/common/ble/ble.mk
+index 752ab419d2..78de01686c 100644
+--- a/plat/marvell/armada/a8k/common/ble/ble.mk
++++ b/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
+--
+2.48.1
+
diff --git a/boot/arm-trusted-firmware/lts-v2.12.1/0001-build-plat-marvell-allow-building-with-non-git-mv-dd.patch b/boot/arm-trusted-firmware/lts-v2.12.1/0001-build-plat-marvell-allow-building-with-non-git-mv-dd.patch
new file mode 100644
index 0000000000..020e04f4b7
--- /dev/null
+++ b/boot/arm-trusted-firmware/lts-v2.12.1/0001-build-plat-marvell-allow-building-with-non-git-mv-dd.patch
@@ -0,0 +1,33 @@
+From 83487cb4f74aa25cc3a03cbfa784d7b410cc3d07 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= <vincent.stehle at arm.com>
+Date: Tue, 8 Apr 2025 13:27:53 +0200
+Subject: [PATCH] build(plat/marvell): allow building with non-git
+ mv-ddr-marvell
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When the mv-ddr-marvell folder is not a git tree the build fails
+complaining that it "does not contain valid mv-ddr-marvell git
+repository".
+
+Remove this check to allow building in Buildroot.
+
+Signed-off-by: Vincent Stehlé <vincent.stehle at arm.com>
+---
+ plat/marvell/armada/a8k/common/ble/ble.mk | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/plat/marvell/armada/a8k/common/ble/ble.mk b/plat/marvell/armada/a8k/common/ble/ble.mk
+index 5ab6123904..654f291732 100644
+--- a/plat/marvell/armada/a8k/common/ble/ble.mk
++++ b/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"))
+ $(q)+make -C $(MV_DDR_PATH) --no-print-directory PLAT_INCLUDES="$(MV_DDR_INCLUDES)" PLATFORM=$(PLAT) ARCH=AARCH64 OBJ_DIR=$(BUILD_PLAT)/ble
+--
+2.48.1
+
diff --git a/boot/arm-trusted-firmware/lts-v2.8.20/0002-build-plat-marvell-allow-building-with-non-git-mv-dd.patch b/boot/arm-trusted-firmware/lts-v2.8.20/0002-build-plat-marvell-allow-building-with-non-git-mv-dd.patch
new file mode 100644
index 0000000000..79ef2788c1
--- /dev/null
+++ b/boot/arm-trusted-firmware/lts-v2.8.20/0002-build-plat-marvell-allow-building-with-non-git-mv-dd.patch
@@ -0,0 +1,33 @@
+From 26073dca5982e86b45d6ff82176418f8624315f5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= <vincent.stehle at arm.com>
+Date: Tue, 8 Apr 2025 13:27:53 +0200
+Subject: [PATCH] build(plat/marvell): allow building with non-git
+ mv-ddr-marvell
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When the mv-ddr-marvell folder is not a git tree the build fails
+complaining that it "does not contain valid mv-ddr-marvell git
+repository".
+
+Remove this check to allow building in Buildroot.
+
+Signed-off-by: Vincent Stehlé <vincent.stehle at arm.com>
+---
+ plat/marvell/armada/a8k/common/ble/ble.mk | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/plat/marvell/armada/a8k/common/ble/ble.mk b/plat/marvell/armada/a8k/common/ble/ble.mk
+index 160e98f12a..569f5f1552 100644
+--- a/plat/marvell/armada/a8k/common/ble/ble.mk
++++ b/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
+--
+2.48.1
+
diff --git a/boot/arm-trusted-firmware/v2.10/0001-build-plat-marvell-allow-building-with-non-git-mv-dd.patch b/boot/arm-trusted-firmware/v2.10/0001-build-plat-marvell-allow-building-with-non-git-mv-dd.patch
new file mode 100644
index 0000000000..d51befa841
--- /dev/null
+++ b/boot/arm-trusted-firmware/v2.10/0001-build-plat-marvell-allow-building-with-non-git-mv-dd.patch
@@ -0,0 +1,33 @@
+From ea879d9dcb7f22b9a0921613bf2f530e2787d0db Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= <vincent.stehle at arm.com>
+Date: Tue, 8 Apr 2025 13:27:53 +0200
+Subject: [PATCH] build(plat/marvell): allow building with non-git
+ mv-ddr-marvell
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When the mv-ddr-marvell folder is not a git tree the build fails
+complaining that it "does not contain valid mv-ddr-marvell git
+repository".
+
+Remove this check to allow building in Buildroot.
+
+Signed-off-by: Vincent Stehlé <vincent.stehle at arm.com>
+---
+ plat/marvell/armada/a8k/common/ble/ble.mk | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/plat/marvell/armada/a8k/common/ble/ble.mk b/plat/marvell/armada/a8k/common/ble/ble.mk
+index 752ab419d2..78de01686c 100644
+--- a/plat/marvell/armada/a8k/common/ble/ble.mk
++++ b/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
+--
+2.48.1
+
diff --git a/boot/arm-trusted-firmware/v2.11/0001-build-plat-marvell-allow-building-with-non-git-mv-dd.patch b/boot/arm-trusted-firmware/v2.11/0001-build-plat-marvell-allow-building-with-non-git-mv-dd.patch
new file mode 100644
index 0000000000..64b66ca7d6
--- /dev/null
+++ b/boot/arm-trusted-firmware/v2.11/0001-build-plat-marvell-allow-building-with-non-git-mv-dd.patch
@@ -0,0 +1,33 @@
+From f0f29a693064915f5df7ab9369f93353c6c692cc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= <vincent.stehle at arm.com>
+Date: Tue, 8 Apr 2025 13:27:53 +0200
+Subject: [PATCH] build(plat/marvell): allow building with non-git
+ mv-ddr-marvell
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When the mv-ddr-marvell folder is not a git tree the build fails
+complaining that it "does not contain valid mv-ddr-marvell git
+repository".
+
+Remove this check to allow building in Buildroot.
+
+Signed-off-by: Vincent Stehlé <vincent.stehle at arm.com>
+---
+ plat/marvell/armada/a8k/common/ble/ble.mk | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/plat/marvell/armada/a8k/common/ble/ble.mk b/plat/marvell/armada/a8k/common/ble/ble.mk
+index 752ab419d2..78de01686c 100644
+--- a/plat/marvell/armada/a8k/common/ble/ble.mk
++++ b/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
+--
+2.48.1
+
diff --git a/boot/arm-trusted-firmware/v2.12/0001-build-plat-marvell-allow-building-with-non-git-mv-dd.patch b/boot/arm-trusted-firmware/v2.12/0001-build-plat-marvell-allow-building-with-non-git-mv-dd.patch
new file mode 100644
index 0000000000..bac73e0e8b
--- /dev/null
+++ b/boot/arm-trusted-firmware/v2.12/0001-build-plat-marvell-allow-building-with-non-git-mv-dd.patch
@@ -0,0 +1,33 @@
+From afa038938b5bc54703a10f9103e6b85e07fd562f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= <vincent.stehle at arm.com>
+Date: Tue, 8 Apr 2025 13:27:53 +0200
+Subject: [PATCH] build(plat/marvell): allow building with non-git
+ mv-ddr-marvell
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When the mv-ddr-marvell folder is not a git tree the build fails
+complaining that it "does not contain valid mv-ddr-marvell git
+repository".
+
+Remove this check to allow building in Buildroot.
+
+Signed-off-by: Vincent Stehlé <vincent.stehle at arm.com>
+---
+ plat/marvell/armada/a8k/common/ble/ble.mk | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/plat/marvell/armada/a8k/common/ble/ble.mk b/plat/marvell/armada/a8k/common/ble/ble.mk
+index 5ab6123904..654f291732 100644
+--- a/plat/marvell/armada/a8k/common/ble/ble.mk
++++ b/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"))
+ $(q)+make -C $(MV_DDR_PATH) --no-print-directory PLAT_INCLUDES="$(MV_DDR_INCLUDES)" PLATFORM=$(PLAT) ARCH=AARCH64 OBJ_DIR=$(BUILD_PLAT)/ble
+--
+2.48.1
+
diff --git a/boot/arm-trusted-firmware/v2.6/0002-build-plat-marvell-allow-building-with-non-git-mv-dd.patch b/boot/arm-trusted-firmware/v2.6/0002-build-plat-marvell-allow-building-with-non-git-mv-dd.patch
new file mode 100644
index 0000000000..d50d5bf860
--- /dev/null
+++ b/boot/arm-trusted-firmware/v2.6/0002-build-plat-marvell-allow-building-with-non-git-mv-dd.patch
@@ -0,0 +1,33 @@
+From e94c6513bad0a2cdb2a2266129c06e5a55826d74 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= <vincent.stehle at arm.com>
+Date: Tue, 8 Apr 2025 13:27:53 +0200
+Subject: [PATCH] build(plat/marvell): allow building with non-git
+ mv-ddr-marvell
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When the mv-ddr-marvell folder is not a git tree the build fails
+complaining that it "does not contain valid mv-ddr-marvell git
+repository".
+
+Remove this check to allow building in Buildroot.
+
+Signed-off-by: Vincent Stehlé <vincent.stehle at arm.com>
+---
+ plat/marvell/armada/a8k/common/ble/ble.mk | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/plat/marvell/armada/a8k/common/ble/ble.mk b/plat/marvell/armada/a8k/common/ble/ble.mk
+index 160e98f12a..569f5f1552 100644
+--- a/plat/marvell/armada/a8k/common/ble/ble.mk
++++ b/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
+--
+2.48.1
+
diff --git a/boot/arm-trusted-firmware/v2.7/0002-build-plat-marvell-allow-building-with-non-git-mv-dd.patch b/boot/arm-trusted-firmware/v2.7/0002-build-plat-marvell-allow-building-with-non-git-mv-dd.patch
new file mode 100644
index 0000000000..4f4770f102
--- /dev/null
+++ b/boot/arm-trusted-firmware/v2.7/0002-build-plat-marvell-allow-building-with-non-git-mv-dd.patch
@@ -0,0 +1,33 @@
+From bbb06a551951a96b738f1aac70f8c2fc44b39e50 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= <vincent.stehle at arm.com>
+Date: Tue, 8 Apr 2025 13:27:53 +0200
+Subject: [PATCH] build(plat/marvell): allow building with non-git
+ mv-ddr-marvell
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When the mv-ddr-marvell folder is not a git tree the build fails
+complaining that it "does not contain valid mv-ddr-marvell git
+repository".
+
+Remove this check to allow building in Buildroot.
+
+Signed-off-by: Vincent Stehlé <vincent.stehle at arm.com>
+---
+ plat/marvell/armada/a8k/common/ble/ble.mk | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/plat/marvell/armada/a8k/common/ble/ble.mk b/plat/marvell/armada/a8k/common/ble/ble.mk
+index 160e98f12a..569f5f1552 100644
+--- a/plat/marvell/armada/a8k/common/ble/ble.mk
++++ b/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
+--
+2.48.1
+
diff --git a/boot/arm-trusted-firmware/v2.8/0003-build-plat-marvell-allow-building-with-non-git-mv-dd.patch b/boot/arm-trusted-firmware/v2.8/0003-build-plat-marvell-allow-building-with-non-git-mv-dd.patch
new file mode 100644
index 0000000000..2ffff2e63f
--- /dev/null
+++ b/boot/arm-trusted-firmware/v2.8/0003-build-plat-marvell-allow-building-with-non-git-mv-dd.patch
@@ -0,0 +1,33 @@
+From e349eb61b8b5f058ad9d54fc063b66ca26cf5a5b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= <vincent.stehle at arm.com>
+Date: Tue, 8 Apr 2025 13:27:53 +0200
+Subject: [PATCH] build(plat/marvell): allow building with non-git
+ mv-ddr-marvell
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When the mv-ddr-marvell folder is not a git tree the build fails
+complaining that it "does not contain valid mv-ddr-marvell git
+repository".
+
+Remove this check to allow building in Buildroot.
+
+Signed-off-by: Vincent Stehlé <vincent.stehle at arm.com>
+---
+ plat/marvell/armada/a8k/common/ble/ble.mk | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/plat/marvell/armada/a8k/common/ble/ble.mk b/plat/marvell/armada/a8k/common/ble/ble.mk
+index 160e98f12a..569f5f1552 100644
+--- a/plat/marvell/armada/a8k/common/ble/ble.mk
++++ b/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
+--
+2.48.1
+
diff --git a/boot/arm-trusted-firmware/v2.9/0002-build-plat-marvell-allow-building-with-non-git-mv-dd.patch b/boot/arm-trusted-firmware/v2.9/0002-build-plat-marvell-allow-building-with-non-git-mv-dd.patch
new file mode 100644
index 0000000000..e411f728b6
--- /dev/null
+++ b/boot/arm-trusted-firmware/v2.9/0002-build-plat-marvell-allow-building-with-non-git-mv-dd.patch
@@ -0,0 +1,33 @@
+From 51d35780d42b53c5215019c9d6ffe28ce768e886 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= <vincent.stehle at arm.com>
+Date: Tue, 8 Apr 2025 13:27:53 +0200
+Subject: [PATCH] build(plat/marvell): allow building with non-git
+ mv-ddr-marvell
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When the mv-ddr-marvell folder is not a git tree the build fails
+complaining that it "does not contain valid mv-ddr-marvell git
+repository".
+
+Remove this check to allow building in Buildroot.
+
+Signed-off-by: Vincent Stehlé <vincent.stehle at arm.com>
+---
+ plat/marvell/armada/a8k/common/ble/ble.mk | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/plat/marvell/armada/a8k/common/ble/ble.mk b/plat/marvell/armada/a8k/common/ble/ble.mk
+index 752ab419d2..78de01686c 100644
+--- a/plat/marvell/armada/a8k/common/ble/ble.mk
++++ b/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
+--
+2.48.1
+
--
2.48.1
More information about the buildroot
mailing list