aboutsummaryrefslogtreecommitdiff
path: root/rpb-uefi.yaml
diff options
context:
space:
mode:
authorRicardo Salveti <ricardo.salveti@linaro.org>2016-11-18 02:36:28 -0200
committerRicardo Salveti <ricardo.salveti@linaro.org>2016-11-18 02:37:43 -0200
commit83f71457e569b8fda04636381e48614b3edb1cac (patch)
tree3215f385199179ba1b7a96e41b9c408d97893653 /rpb-uefi.yaml
parent4a89f6cb26d9d503db17f06da6d831a7fa168aaf (diff)
rpb-uefi: set build profile to GCC49 by default
Still preferred by upstream, until the GCC5 profile is fully funcional. Change-Id: I85ae5c273e81cee21d08506f4383dda5a6a11be7 Signed-off-by: Ricardo Salveti <ricardo.salveti@linaro.org>
Diffstat (limited to 'rpb-uefi.yaml')
-rw-r--r--rpb-uefi.yaml12
1 files changed, 5 insertions, 7 deletions
diff --git a/rpb-uefi.yaml b/rpb-uefi.yaml
index 355c1dfe23..2f615533d9 100644
--- a/rpb-uefi.yaml
+++ b/rpb-uefi.yaml
@@ -126,14 +126,12 @@
ATF_GIT_VERSION="origin/hikey"
OPEN_PLATFORM_PKG_GIT_URL=https://github.com/96boards-hikey/OpenPlatformPkg.git
OPEN_PLATFORM_PKG_GIT_BRANCH=hikey-aosp
-
- # FIXME cap GCC build profile at GCC49
- # workaround [GCC5] not defined. No toolchain available for build!
- # https://git.linaro.org/uefi/uefi-tools.git/commitdiff/4ad46ab76ee2d593c665c1f6ae16162bdf5a36ac
- sed -i 's|echo GCC5|echo GCC49|' uefi-tools/common-functions
- export AARCH64_TOOLCHAIN=GCC49
fi
+ # Force cap GCC build profile to GCC49, still preferred by upstream
+ TOOLCHAIN=GCC49
+ export AARCH64_TOOLCHAIN=GCC49
+
git clone $EDK2_GIT_URL edk2
cd edk2; git checkout -b stable-baseline $EDK2_GIT_VERSION
EDK2_GIT_VERSION=$(git rev-parse $EDK2_GIT_VERSION)
@@ -164,7 +162,7 @@
# Build UEFI for the desired platform, with the specified build type
cd ${EDK2_DIR}
- bash -x ${UEFI_TOOLS_DIR}/uefi-build.sh -b ${MX_TYPE} -a ${ATF_DIR} -s ${OPTEE_OS_DIR} ${MX_PLATFORM}
+ bash -x ${UEFI_TOOLS_DIR}/uefi-build.sh -T ${TOOLCHAIN} -b ${MX_TYPE} -a ${ATF_DIR} -s ${OPTEE_OS_DIR} ${MX_PLATFORM}
unset WORKSPACE
export WORKSPACE=${JENKINS_WORKSPACE}