Point to node GNU GCC Linaro's 6.2.1 toolchain under non-arm enviromment
The GNU GCC Linaro 6.2.1 toolchain is now part for the
node (docker-amd64-tf-a-ubuntu:bionic) so use the latter instead of
internal Arm one in case of non-arm enviroment.
Signed-off-by: Leonardo Sandoval <leonardo.sandoval@linaro.org>
Change-Id: I401617dcf3c6c9c0a9992c054b3692355d5e53c6
diff --git a/script/build_package.sh b/script/build_package.sh
index cd5caf2..9bdf736 100755
--- a/script/build_package.sh
+++ b/script/build_package.sh
@@ -617,7 +617,7 @@
scp_tools_arm_tf="$scp_tools_root/arm-tf"
- cross_compile="/arm/pdsw/tools/gcc-linaro-6.2.1-2016.11-x86_64_aarch64-linux-gnu/bin/aarch64-linux-gnu-"
+ cross_compile="$(set_cross_compile_gcc_linaro_toolchain)"
std_libs="-I$scp_tools_arm_tf/include/common"
std_libs="$std_libs -I$scp_tools_arm_tf/include/common/tbbr"
@@ -663,7 +663,7 @@
cd "$scp_tools_root/arm-tf"
- cross_compile="/arm/pdsw/tools/gcc-linaro-6.2.1-2016.11-x86_64_aarch64-linux-gnu/bin/aarch64-linux-gnu-"
+ cross_compile="$(set_cross_compile_gcc_linaro_toolchain)"
if [ "$1" = "release" ]; then
echo "Build TF-4-SCP-Tools rls..."
@@ -694,7 +694,7 @@
cd "$scp_tools_root/arm-tf"
- cross_compile="/arm/pdsw/tools/gcc-linaro-6.2.1-2016.11-x86_64_aarch64-linux-gnu/bin/aarch64-linux-gnu-"
+ cross_compile="$(set_cross_compile_gcc_linaro_toolchain)"
if [ ! -d "$scp_root/build/product/juno/scp_ramfw/debug" ]; then
make fiptool
diff --git a/script/tf-coverity/tf-cov-make b/script/tf-coverity/tf-cov-make
index 44078a2..5105056 100755
--- a/script/tf-coverity/tf-cov-make
+++ b/script/tf-coverity/tf-cov-make
@@ -86,6 +86,15 @@
return 1
}
+set_cross_compile_gcc_linaro_toolchain() {
+ local cross_compile_path="/home/buildslave/tools"
+
+ # if under arm enviroment, overide cross-compilation path
+ is_arm_jenkins_env && cross_compile_path="/arm/pdsw/tools"
+
+ echo "${cross_compile_path}/gcc-linaro-6.2.1-2016.11-x86_64_aarch64-linux-gnu/bin/aarch64-linux-gnu-"
+}
+
#
# FVP platform
# We'll use the following flags for all FVP builds.
@@ -389,17 +398,17 @@
# These platforms from Marvell have dependency on GCC-6.2.1 toolchain
make PLAT=a80x0 DEBUG=1 SCP_BL2=/dev/null \
- CROSS_COMPILE=/arm/pdsw/tools/gcc-linaro-6.2.1-2016.11-x86_64_aarch64-linux-gnu/bin/aarch64-linux-gnu- all
+ CROSS_COMPILE="$(set_cross_compile_gcc_linaro_toolchain)" all
make PLAT=a80x0_mcbin DEBUG=1 SCP_BL2=/dev/null \
- CROSS_COMPILE=/arm/pdsw/tools/gcc-linaro-6.2.1-2016.11-x86_64_aarch64-linux-gnu/bin/aarch64-linux-gnu- all
+ CROSS_COMPILE="$(set_cross_compile_gcc_linaro_toolchain)" all
make PLAT=a70x0 DEBUG=1 SCP_BL2=/dev/null \
- CROSS_COMPILE=/arm/pdsw/tools/gcc-linaro-6.2.1-2016.11-x86_64_aarch64-linux-gnu/bin/aarch64-linux-gnu- all
+ CROSS_COMPILE="$(set_cross_compile_gcc_linaro_toolchain)" all
make PLAT=a70x0_amc DEBUG=1 SCP_BL2=/dev/null \
- CROSS_COMPILE=/arm/pdsw/tools/gcc-linaro-6.2.1-2016.11-x86_64_aarch64-linux-gnu/bin/aarch64-linux-gnu- all
+ CROSS_COMPILE="$(set_cross_compile_gcc_linaro_toolchain)" all
make PLAT=a80x0_puzzle DEBUG=1 SCP_BL2=/dev/null \
- CROSS_COMPILE=/arm/pdsw/tools/gcc-linaro-6.2.1-2016.11-x86_64_aarch64-linux-gnu/bin/aarch64-linux-gnu- all
+ CROSS_COMPILE="$(set_cross_compile_gcc_linaro_toolchain)" all
make PLAT=t9130 DEBUG=1 SCP_BL2=/dev/null \
- CROSS_COMPILE=/arm/pdsw/tools/gcc-linaro-6.2.1-2016.11-x86_64_aarch64-linux-gnu/bin/aarch64-linux-gnu- all
+ CROSS_COMPILE="$(set_cross_compile_gcc_linaro_toolchain)" all
# Removing the source files
rm -rf drivers/marvell/mv_ddr 2> /dev/null
diff --git a/utils.sh b/utils.sh
index 66398f1..5465e56 100644
--- a/utils.sh
+++ b/utils.sh
@@ -275,6 +275,17 @@
return $(is_jenkins_env "$arm_domain")
}
+
+# Provide correct linaro cross toolchain based on environment
+set_cross_compile_gcc_linaro_toolchain() {
+ local cross_compile_path="/home/buildslave/tools"
+
+ # if under arm enviroment, overide cross-compilation path
+ is_arm_jenkins_env && cross_compile_path="/arm/pdsw/tools"
+
+ echo "${cross_compile_path}/gcc-linaro-6.2.1-2016.11-x86_64_aarch64-linux-gnu/bin/aarch64-linux-gnu-"
+}
+
if is_jenkins_env; then
jenkins_run=1
umask 0002