Update gcc-arm toolchains to 9.2-2019.12
Besides the update, rename toolchain including the infix '-none-'. Also, avoid
hardcoded filenames and/or directories referring toolchains.
Change-Id: I576aa5bc9ca0b29b5b8ec6264af540b0053bc4e5
Signed-off-by: Leonardo Sandoval <leonardo.sandoval@linaro.org>
diff --git a/coverity/run_coverity.sh b/coverity/run_coverity.sh
index 374b1fe..b2e741a 100755
--- a/coverity/run_coverity.sh
+++ b/coverity/run_coverity.sh
@@ -48,10 +48,10 @@
fi
# Check that the AArch64 cross-toolchain is available.
- aarch64-linux-gnu-gcc --version
+ aarch64-none-elf-gcc --version
# Check that the AArch32 cross-toolchain is available.
- arm-linux-gnueabihf-gcc --version
+ arm-none-eabi-gcc --version
echo
echo "Checks complete."
@@ -75,13 +75,13 @@
cov-configure \
--comptype gcc \
--template \
- --compiler aarch64-linux-gnu-gcc \
+ --compiler aarch64-none-elf-gcc \
--config cov-config/config.xml
# 2) AArch32 compiler
cov-configure \
--comptype gcc \
--template \
- --compiler arm-linux-gnueabihf-gcc \
+ --compiler arm-none-eabi-gcc \
--config cov-config/config.xml
}
diff --git a/script/tf-coverity/tf-cov-make b/script/tf-coverity/tf-cov-make
index 36cc290..7502e9f 100755
--- a/script/tf-coverity/tf-cov-make
+++ b/script/tf-coverity/tf-cov-make
@@ -24,7 +24,7 @@
exit 1
fi
-export CROSS_COMPILE=aarch64-linux-gnu-
+export CROSS_COMPILE=aarch64-none-elf-
# Get mbed TLS library code to build Trusted Firmware with Trusted Board Boot
# support. The version of mbed TLS to use here must be the same as when
@@ -106,15 +106,15 @@
clean_build $fvp_common_flags ENABLE_STACK_PROTECTOR=strong
# AArch32 build
-clean_build $fvp_common_flags CROSS_COMPILE=arm-linux-gnueabihf- \
+clean_build $fvp_common_flags CROSS_COMPILE=arm-none-eabi- \
ARCH=aarch32 AARCH32_SP=sp_min \
RESET_TO_SP_MIN=1 PRELOADED_BL33_BASE=0x80000000
-clean_build $fvp_common_flags CROSS_COMPILE=arm-linux-gnueabihf- \
+clean_build $fvp_common_flags CROSS_COMPILE=arm-none-eabi- \
ARCH=aarch32 AARCH32_SP=sp_min
# Xlat tables lib version 1 (AArch64 and AArch32)
clean_build $fvp_common_flags ARM_XLAT_TABLES_LIB_V1=1 RECLAIM_INIT_CODE=0
-clean_build $fvp_common_flags CROSS_COMPILE=arm-linux-gnueabihf- \
+clean_build $fvp_common_flags CROSS_COMPILE=arm-none-eabi- \
ARCH=aarch32 AARCH32_SP=sp_min ARM_XLAT_TABLES_LIB_V1=1 RECLAIM_INIT_CODE=0
# Using GIC600 driver
@@ -125,7 +125,7 @@
#BL2 at EL3 support
clean_build $fvp_common_flags BL2_AT_EL3=1
-clean_build $fvp_common_flags CROSS_COMPILE=arm-linux-gnueabihf- \
+clean_build $fvp_common_flags CROSS_COMPILE=arm-none-eabi- \
ARCH=aarch32 AARCH32_SP=sp_min BL2_AT_EL3=1
#
diff --git a/utils.sh b/utils.sh
index 3e76899..0f35d04 100644
--- a/utils.sh
+++ b/utils.sh
@@ -305,14 +305,20 @@
#export coverity_host
+# Define toolchain version and toolchain binary paths
+toolchain_version="9.2-2019.12"
+
+aarch64_none_elf_dir="${nfs_volume}/pdsw/tools/gcc-arm-${toolchain_version}-x86_64-aarch64-none-elf"
+aarch64_none_elf_prefix="aarch64-none-elf-"
+
+arm_none_eabi_dir="${nfs_volume}/pdsw/tools/gcc-arm-${toolchain_version}-x86_64-arm-none-eabi"
+arm_none_eabi_prefix="arm-none-eabi-"
+
path_list=(
-#Need to upgrade gcc to the following version
-#"/arm/pdsw/tools/gcc-arm-9.2-2019.12-x86_64-aarch64-none-elf/bin"
-#"/arm/pdsw/tools/gcc-arm-9.2-2019.12-x86_64-arm-none-eabi/bin"
-"${nfs_volume}/pdsw/tools/gcc-linaro-6.2.1-2016.11-x86_64_aarch64-linux-gnu/bin"
-"${nfs_volume}/pdsw/tools/gcc-linaro-6.2.1-2016.11-x86_64_arm-linux-gnueabihf/bin"
-"${nfs_volume}/pdsw/tools/gcc-arm-none-eabi-5_4-2016q3/bin"
-"$coverity_path/bin"
+ "${aarch64_none_elf_dir}/bin"
+ "${arm_none_eabi_dir}/bin"
+ "${nfs_volume}/pdsw/tools/gcc-arm-none-eabi-5_4-2016q3/bin"
+ "$coverity_path/bin"
)
ld_library_path_list=(