[PATCH 1/2] Dockerfile: Update to a more current TF-A release tag

[PATCH 1/2] Dockerfile: Update to a more current TF-A release tag

[Tom Rini]

In preparation for using TF-A more in our CI loops, switch to the
current release tag for TF-A.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 tools/docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index e14d1640f9cd..3b0c403618a8 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -230,7 +230,7 @@ RUN git clone https://gitlab.com/qemu-project/qemu.git /tmp/qemu && \
 # Build fiptool
 RUN git clone https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git /tmp/tf-a && \
 	cd /tmp/tf-a/ && \
-	git checkout v2.10.0 && \
+	git checkout v2.12.0 && \
 	cd tools/fiptool && \
 	make -j$(nproc) && \
 	mkdir -p /usr/local/bin && \
-- 
2.43.0

[PATCH 2/2] Dockerfile: Download the Arm FVP and extract it

[Tom Rini]

There are some reference platforms from Arm which are not found in QEMU
but instead in the FVP tool. As we can make use of this in CI later on,
download and extract it in our Dockerfile today.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 tools/docker/Dockerfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index 3b0c403618a8..260af61bd3db 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -237,6 +237,9 @@ RUN git clone https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git /tmp/t
 	cp fiptool /usr/local/bin && \
 	rm -rf /tmp/tf-a
 
+# Download the Arm Architecture FVP platform. This file is double compressed.
+RUN wget -O - https://developer.arm.com/-/cdn-downloads/permalink/FVPs-Architecture/FM-11.28/FVP_Base_RevC-2xAEMvA_11.28_23_Linux64.tgz | gunzip -dc | tar -C /opt -x
+
 # Build genimage (required by some targets to generate disk images)
 RUN wget -O - https://github.com/pengutronix/genimage/releases/download/v14/genimage-14.tar.xz | tar -C /tmp -xJ && \
 	cd /tmp/genimage-14 && \
-- 
2.43.0

Re: [PATCH 1/2] Dockerfile: Update to a more current TF-A release tag

[Tom Rini]

On Tue, 08 Apr 2025 14:21:40 -0600, Tom Rini wrote:

> In preparation for using TF-A more in our CI loops, switch to the
> current release tag for TF-A.
> 
> 

Applied to u-boot/master, thanks!

[1/2] Dockerfile: Update to a more current TF-A release tag
      commit: fe8a33b81cacdd01379f3a72b8dcb0dc29aa9cf5
[2/2] Dockerfile: Download the Arm FVP and extract it
      commit: 01fa1b18ae68381d9d462be66df3943f41426874
-- 
Tom