From 5fd9bac07e25f4f041e21af4dc9a8f2c35e10d0d Mon Sep 17 00:00:00 2001 From: Ryan Roberts Date: Mon, 16 Jan 2023 10:09:21 +0000 Subject: [PATCH] docker: Build FVP into aarch64 docker image Now that Arm have released a public build of the FVP_Base_RevC-2xAEMvA for aarch64 linux systems, add that to the aarch64 docker image, just like we do with x86_64. This brings aarch64 to feature parity with x86_64. Note that while we are using FVP 11.20 for aarch64, we are still using 18.16 for x86_64. 11.20 is the first available release for aarch64, but a performance regression was seen with it on x86_64 so we are holding off upgrading for x86_64 until the regression is fixed. Signed-off-by: Ryan Roberts --- docker/build.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/docker/build.sh b/docker/build.sh index ee9020c..e239b1d 100755 --- a/docker/build.sh +++ b/docker/build.sh @@ -48,7 +48,10 @@ elif [ "${ARCH}" == "aarch64" ]; then TCH_PKG_URL_AARCH32=https://developer.arm.com/-/media/Files/downloads/gnu/11.3.rel1/binrel TCH_PKG_NAME_AARCH32=arm-gnu-toolchain-11.3.rel1-aarch64-arm-none-eabi.tar.xz TCH_PATH_AARCH32=arm-gnu-toolchain-11.3.rel1-aarch64-arm-none-eabi/bin - FVP_PKG_NAME=none + FVP_PKG_URL=https://developer.arm.com/-/media/Files/downloads/ecosystem-models + FVP_PKG_NAME=FVP_Base_RevC-2xAEMvA_11.20_15_Linux64_armv8l.tgz + FVP_MODEL_DIR=Base_RevC_AEMvA_pkg/models/Linux64_armv8l_GCC-9.3 + FVP_PLUGIN_DIR=Base_RevC_AEMvA_pkg/plugins/Linux64_armv8l_GCC-9.3 else echo "Host architecture ${ARCH} not supported" exit 1 @@ -59,11 +62,7 @@ echo "Building for version ${VERSION} for ${ARCH}..." # Build the image. wget -q -O ${TCH_PKG_NAME_AARCH64} ${TCH_PKG_URL_AARCH64}/${TCH_PKG_NAME_AARCH64} wget -q -O ${TCH_PKG_NAME_AARCH32} ${TCH_PKG_URL_AARCH32}/${TCH_PKG_NAME_AARCH32} -if [ "${FVP_PKG_NAME}" != "none" ]; then - wget -q -O ${FVP_PKG_NAME} ${FVP_PKG_URL}/${FVP_PKG_NAME} -else - touch ${FVP_PKG_NAME} -fi +wget -q -O ${FVP_PKG_NAME} ${FVP_PKG_URL}/${FVP_PKG_NAME} docker build \ --build-arg=BASE=docker.io/library/debian:bullseye-slim \ --build-arg=TCH_PKG_NAME_AARCH64=${TCH_PKG_NAME_AARCH64} \ -- GitLab