From b82c0b38c46f8d3265768837777c8af3e5237fea Mon Sep 17 00:00:00 2001
From: Wilfried Chauveau <wilfried.chauveau@arm.com>
Date: Mon, 5 Feb 2024 13:24:25 +0000
Subject: [PATCH] =?UTF-8?q?ci:=20Add=20FVP=E2=80=AFfor=20Corstone-300=20&?=
 =?UTF-8?q?=20Corstone-310?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Wilfried Chauveau <wilfried.chauveau@arm.com>
---
 Dockerfile.ci | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/Dockerfile.ci b/Dockerfile.ci
index 8c6fd62..b33388b 100644
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -21,6 +21,10 @@ ARG FVP_BASE_REVC_VERSION=11.24_11
 ENV FVP_BASE_REVC_VERSION=$FVP_BASE_REVC_VERSION
 ARG FVP_BASE_AEMV8R_VERSION=11.24_11
 ENV FVP_BASE_AEMV8R_VERSION=$FVP_BASE_AEMV8R_VERSION
+ARG FVP_CORSTONE300_VERSION=11.24_13
+ENV FVP_CORSTONE300_VERSION=$FVP_CORSTONE300_VERSION
+ARG FVP_CORSTONE310_VERSION=11.24_13
+ENV FVP_CORSTONE310_VERSION=$FVP_CORSTONE310_VERSION
 ENV ARMFVP_BIN_PATH=/usr/local/bin
 ARG WGET_ARGS="-q --show-progress --progress=bar:force:noscroll"
 
@@ -98,18 +102,25 @@ RUN mkdir -p /opt/toolchains && \
 	rm zephyr-sdk-${ZSDK_VERSION}_linux-${HOSTTYPE}.tar.xz
 
 # Install FVP
+#
+# Ecosystem FVP License permits redistribution (refer to the relevant license available in the container).
 RUN if [ "${HOSTTYPE}" = "x86_64" ]; then \
-    mkdir -p /opt/fvps && \
-    cd /opt/fvps && \
-    wget ${WGET_ARGS} https://developer.arm.com/-/media/Files/downloads/ecosystem-models/FVP_Base_RevC-2xAEMvA_${FVP_BASE_REVC_VERSION}_Linux64.tgz && \
-    tar xf FVP_Base_RevC-2xAEMvA_${FVP_BASE_REVC_VERSION}_Linux64.tgz && \
-    ln -s /opt/fvps/Base_RevC_AEMvA_pkg/models/Linux64_GCC-9.3/FVP_Base_RevC-2xAEMvA /usr/local/bin && \
-    rm FVP_Base_RevC-2xAEMvA_${FVP_BASE_REVC_VERSION}_Linux64.tgz && \
-    wget ${WGET_ARGS} https://developer.arm.com/-/media/Files/downloads/ecosystem-models/FVP_Base_AEMv8R_${FVP_BASE_AEMV8R_VERSION}_Linux64.tgz && \
-    tar xf FVP_Base_AEMv8R_${FVP_BASE_AEMV8R_VERSION}_Linux64.tgz && \
-    ln -s /opt/fvps/AEMv8R_base_pkg/models/Linux64_GCC-9.3/FVP_BaseR_AEMv8R /usr/local/bin && \
-    rm FVP_Base_AEMv8R_${FVP_BASE_AEMV8R_VERSION}_Linux64.tgz \
-    ; fi
+	mkdir -p /opt/fvps && \
+	cd /opt/fvps && \
+	wget ${WGET_ARGS} -O- https://developer.arm.com/-/media/Files/downloads/ecosystem-models/FVP_Base_RevC-2xAEMvA_${FVP_BASE_REVC_VERSION}_Linux64.tgz | tar xz && \
+	wget ${WGET_ARGS} -O- https://developer.arm.com/-/media/Files/downloads/ecosystem-models/FVP_Base_AEMv8R_${FVP_BASE_AEMV8R_VERSION}_Linux64.tgz | tar xz && \
+	wget ${WGET_ARGS} -O- https://developer.arm.com/-/media/Arm%20Developer%20Community/Downloads/OSS/FVP/Corstone-300/FVP_Corstone_SSE-300_${FVP_CORSTONE300_VERSION}_Linux64.tgz | tar xz && \
+	wget ${WGET_ARGS} -O- https://developer.arm.com/-/media/Arm%20Developer%20Community/Downloads/OSS/FVP/Corstone-310/FVP_Corstone_SSE-310_${FVP_CORSTONE310_VERSION}_Linux64.tgz | tar xz && \
+	./FVP_Corstone_SSE-300.sh --no-interactive --i-agree-to-the-contained-eula && \
+	./FVP_Corstone_SSE-310.sh --no-interactive --i-agree-to-the-contained-eula && \
+	ln -s /opt/fvps/Base_RevC_AEMvA_pkg/models/Linux64_GCC-9.3/FVP_Base_RevC-2xAEMvA /usr/local/bin && \
+	ln -s /opt/fvps/AEMv8R_base_pkg/models/Linux64_GCC-9.3/FVP_BaseR_AEMv8R /usr/local/bin && \
+	ln -s /usr/local/FVP_Corstone_SSE-300/models/Linux64_GCC-9.3/FVP_Corstone_SSE-300_Ethos-U55 /usr/local/bin && \
+	ln -s /usr/local/FVP_Corstone_SSE-300/models/Linux64_GCC-9.3/FVP_Corstone_SSE-300_Ethos-U65 /usr/local/bin && \
+	ln -s /usr/local/FVP_Corstone_SSE-310/models/Linux64_GCC-9.3/FVP_Corstone_SSE-310 /usr/local/bin && \
+	ln -s /usr/local/FVP_Corstone_SSE-310/models/Linux64_GCC-9.3/FVP_Corstone_SSE-310_Ethos-U65 /usr/local/bin && \
+	rm FVP_Corstone_SSE-300.sh FVP_Corstone_SSE-310.sh \
+	; fi
 
 # Clean up stale packages
 RUN apt-get clean -y && \