TF-M: Removes deprecated GCC versions
Removes GCC 7.3.1, 10.3 and 11.2 from the docker definitions.
Change-Id: Id82ecd9ab36b82e610368313bad5a4ccdcab28e7
Signed-off-by: Matthew Dalzell <matthew.dalzell@arm.com>
diff --git a/jammy-amd64-tf-m-build/Dockerfile b/jammy-amd64-tf-m-build/Dockerfile
index 79947e5..9106f2e 100644
--- a/jammy-amd64-tf-m-build/Dockerfile
+++ b/jammy-amd64-tf-m-build/Dockerfile
@@ -10,12 +10,6 @@
ENV PATH=${TOOLS_DIR}/bin:${PATH}
ENV PLANTUML_JAR_PATH=/usr/share/plantuml/plantuml.jar
ENV COMPILER_DIR=/home/buildslave/compiler
-ENV GCC_7_3_1_DIR=${COMPILER_DIR}/gcc-7-3-1
-ENV GCC_7_3_1_PATH=${GCC_7_3_1_DIR}/bin
-ENV GCC_10_3_DIR=${COMPILER_DIR}/gcc-10-3
-ENV GCC_10_3_PATH=${GCC_10_3_DIR}/bin
-ENV GCC_11_2_DIR=${COMPILER_DIR}/gcc-11-2
-ENV GCC_11_2_PATH=${GCC_11_2_DIR}/bin
ENV GCC_13_2_DIR=${COMPILER_DIR}/gcc-13-2
ENV GCC_13_2_PATH=${GCC_13_2_DIR}/bin
ENV GCC_14_2_DIR=${COMPILER_DIR}/gcc-14-2
diff --git a/jammy-amd64-tf-m-build/tf-dependencies.install b/jammy-amd64-tf-m-build/tf-dependencies.install
index b369f24..5be2894 100755
--- a/jammy-amd64-tf-m-build/tf-dependencies.install
+++ b/jammy-amd64-tf-m-build/tf-dependencies.install
@@ -21,24 +21,6 @@
https://github.com/Kitware/CMake/releases/download/v3.21.7/cmake-3.21.7-linux-x86_64.tar.gz
tar -xf /tmp/cmake-Linux-x86_64.tar.gz -C ${TOOLS_DIR} --strip-components=1
-# Install Arm GCC v7.3.1 toolchain to GCC_7_3_1_DIR (arm-none-eabi)
-mkdir -p ${GCC_7_3_1_DIR}
-curl --create-dirs -fsSLo /tmp/gcc-arm-x86_64-arm-none-eabi-7-3-1.tar.bz2 \
- https://developer.arm.com/-/media/Files/downloads/gnu-rm/7-2018q2/gcc-arm-none-eabi-7-2018-q2-update-linux.tar.bz2?revision=bc2c96c0-14b5-4bb4-9f18-bceb4050fee7?product=GNU%20Arm%20Embedded%20Toolchain%20Downloads,64-bit,,Linux,7-2018-q2-update
-tar -xf /tmp/gcc-arm-x86_64-arm-none-eabi-7-3-1.tar.bz2 -C ${GCC_7_3_1_DIR} --strip-components=1
-
-# Install Arm GCC v10.3 toolchain to GCC_10_3_DIR (arm-none-eabi)
-mkdir -p ${GCC_10_3_DIR}
-curl --create-dirs -fsSLo /tmp/gcc-arm-x86_64-arm-none-eabi-10-3.tar.bz2 \
- https://developer.arm.com/-/media/Files/downloads/gnu-rm/10.3-2021.10/gcc-arm-none-eabi-10.3-2021.10-x86_64-linux.tar.bz2
-tar -xf /tmp/gcc-arm-x86_64-arm-none-eabi-10-3.tar.bz2 -C ${GCC_10_3_DIR} --strip-components=1
-
-# Install Arm GCC v11.2 toolchain to GCC_11_2_DIR (arm-none-eabi)
-mkdir -p ${GCC_11_2_DIR}
-curl --create-dirs -fsSLo /tmp/gcc-arm-11.2-2022.02-x86_64-arm-none-eabi.tar.xz \
- https://developer.arm.com/-/media/Files/downloads/gnu/11.2-2022.02/binrel/gcc-arm-11.2-2022.02-x86_64-arm-none-eabi.tar.xz
-tar -xf /tmp/gcc-arm-11.2-2022.02-x86_64-arm-none-eabi.tar.xz -C ${GCC_11_2_DIR} --strip-components=1
-
# Install Arm GCC v13.2 toolchain to GCC_13_2_DIR (arm-none-eabi)
mkdir -p ${GCC_13_2_DIR}
curl --create-dirs -fsSLo /tmp/arm-gnu-toolchain-13.2.rel1-x86_64-arm-none-eabi.tar.xz \
diff --git a/jammy-amd64-tf-m-build/tf-environment.install b/jammy-amd64-tf-m-build/tf-environment.install
index 1f5fda8..3a9dc85 100755
--- a/jammy-amd64-tf-m-build/tf-environment.install
+++ b/jammy-amd64-tf-m-build/tf-environment.install
@@ -8,6 +8,5 @@
env | grep PLANTUML_JAR_PATH >> /etc/environment
env | grep TOOLS_DIR >> /etc/environment
env | grep PATH >> /etc/environment
-env | grep GCC_7_3_1_PATH >> /etc/environment
-env | grep GCC_10_3_PATH >> /etc/environment
+env | grep GCC_13_2_PATH >> /etc/environment
env | grep CLANG_20_1_PATH >> /etc/environment
\ No newline at end of file