Re: [Buildroot] [PATCH] boot/arm-trusted-firmware: fix the build for macchiatobin

[Julien Olivain <ju.o@free.fr>]

Hi Vincent,

Thank you for the patch!

I have a minor change request. See below.

On 10/04/2025 14:14, Vincent Stehlé wrote:
> 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@arm.com>
> Cc: Dick Olsson <hi@senzilla.io>
> Cc: Sergey Matyukevich <geomatsi@gmail.com>
> ---

[...]

> 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

Could you remove those exclusion lines in .checkpackageignore. The 
intent of this
file is to exclude the check old patches without this "Upstream:" tag. 
This tag can
also be used to capture the reason why a patch was not proposed 
upstream. Here
the reason is simply because it is specific to Buildroot.

>  
> 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@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.
> +

Here, could you add for example:

Upstream: Not applicable. Buildroot specific.

> +Signed-off-by: Vincent Stehlé <vincent.stehle@arm.com>

Could you add this tag on all patches, and send an updated version 
please?

Best regards,

Julien.
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot