jammy-amd64-tf-a-build-lts2.8: Sync with upstream re: ArmClang
Remove unused ArmClang 6.9, add ArmClang 6.18 which is actually should
be used for builds, and required for UBL licensing to which we switch.
Ticket: https://linaro.atlassian.net/browse/TFC-198
Signed-off-by: Paul Sokolovsky <paul.sokolovsky@linaro.org>
Change-Id: I6b99306d055424c42ff76e4d961a022fde584295
diff --git a/jammy-amd64-tf-a-build-lts2.8/tf-dependencies.install b/jammy-amd64-tf-a-build-lts2.8/tf-dependencies.install
index 2c4c9b8..5c0cbd2 100755
--- a/jammy-amd64-tf-a-build-lts2.8/tf-dependencies.install
+++ b/jammy-amd64-tf-a-build-lts2.8/tf-dependencies.install
@@ -44,28 +44,16 @@
https://releases.linaro.org/components/toolchain/binaries/6.2-2016.11/aarch64-linux-gnu/gcc-linaro-6.2.1-2016.11-x86_64_aarch64-linux-gnu.tar.xz
tar -Jxf /tmp/gcc-linaro-x86_64_aarch64-linux-gnu.tar.xz -C ${TOOLS_DIR}
-# 2022-11-11: No longer available at Arm download page
-## Install Arm Clang 6.8 toolchain (armclang)
-## NOTE: Toolchain is not available through PATH so to use it, CC should point to
-## CC=${TOOLS_DIR}/armclang-6.8/bin/armclang
-#mkdir -p /tmp/armclang-6.8
-#wget -O /tmp/DS500-BN-00026-r5p0-10rel0.tgz \
-# -q https://developer.arm.com/-/media/Files/downloads/compiler/DS500-BN-00026-r5p0-10rel0.tgz
-#tar -xf /tmp/DS500-BN-00026-r5p0-10rel0.tgz -C /tmp/armclang-6.8
-#/tmp/armclang-6.8/install_x86_64.sh --no-interactive --i-agree-to-the-contained-eula -d ${TOOLS_DIR}/armclang-6.8
-
-# Install Arm Clang 6.9 toolchain (armclang)
-# NOTE: Toolchain is not available through PATH so to use it, CC should point to
-# CC=${TOOLS_DIR}/armclang-6.9/bin/armclang
-mkdir -p /tmp/armclang-6.9
-tar -xf /tmp/DS500-BN-00026-r5p0-11rel0.tar.gz -C /tmp/armclang-6.9
-/tmp/armclang-6.9/install_x86_64.sh --no-interactive --i-agree-to-the-contained-eula -d ${TOOLS_DIR}/armclang-6.9
-
# Install Arm Clang 6.17 toolchain (armclang)
mkdir -p /tmp/armclang-6.17
tar -xf /tmp/DS500-BN-00026-r5p0-19rel0.tar.gz -C /tmp/armclang-6.17
/tmp/armclang-6.17/install_x86_64.sh --no-interactive --i-agree-to-the-contained-eula -d ${TOOLS_DIR}/armclang-6.17
+# Install Arm Clang 6.18 toolchain (armclang)
+mkdir -p /tmp/armclang-6.18
+tar -xf /tmp/ARMCompiler6.18_standalone_linux-x86_64.tar.gz -C /tmp/armclang-6.18
+/tmp/armclang-6.18/install_x86_64.sh --no-interactive --i-agree-to-the-contained-eula -d ${TOOLS_DIR}/armclang-6.18
+
# Additional binaries required
mkdir -p nfs/downloads/linaro/20.01
cd nfs/downloads/linaro/20.01