Skip to contentSkip to conversation

Dockerfile: Update to a more current TF-A release tag

PATCH In review Tom Rini 1 participant 3 messages Apr 8, 2025 – Apr 10, 2025

lore
Share & tools
lore

Tom Rini

author
#0 lore raw

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

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

---
 tools/docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/docker/Dockerfile +1 -1
index e14d1640f9cd..3b0c403618a8 100644
@@ -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 && \
Signature · 1 line
2.43.0
author
#1 lore raw

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

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.

---
 tools/docker/Dockerfile | 3 +++
 1 file changed, 3 insertions(+)
tools/docker/Dockerfile +3 -0
index 3b0c403618a8..260af61bd3db 100644
@@ -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 && \
Signature · 1 line
2.43.0
author
#2 lore raw
In reply to Tom Rini
Quoted 4 lines · Tom Rini

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
Signature · 1 line
Tom