diff options
| author | Fathi Boudra <fathi.boudra@linaro.org> | 2017-10-26 13:16:47 +0300 |
|---|---|---|
| committer | Fathi Boudra <fathi.boudra@linaro.org> | 2017-10-26 13:16:47 +0300 |
| commit | 660ce74f86453ae2c2f1817b141ae5a28463dd68 (patch) | |
| tree | cf9844872112b7d9efeb08021bc4d0a61c6c4ed8 /rpb-uefi | |
| parent | f581c42413082b87c2f184cc3104c33a013f8bbb (diff) | |
rpb-uefi-staging: update to OP-TEE 2.6.0
HiKey and HiKey960 are now using the same repositories/version overrides.
Change-Id: I433ae1ec6a2975e28c489ce28ac0bda7660e7f6d
Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
Diffstat (limited to 'rpb-uefi')
| -rwxr-xr-x | rpb-uefi/staging/builders.sh | 31 |
1 files changed, 11 insertions, 20 deletions
diff --git a/rpb-uefi/staging/builders.sh b/rpb-uefi/staging/builders.sh index bcfec3c952..cb972ba454 100755 --- a/rpb-uefi/staging/builders.sh +++ b/rpb-uefi/staging/builders.sh @@ -52,26 +52,17 @@ OPTEE_GIT_VERSION=$OPTEE_VERSION mkdir ${BUILD_NUMBER}; cd ${BUILD_NUMBER} # Per board repositories overrides -if [ "${MX_PLATFORM}" = "hikey" ]; then - EDK2_GIT_URL=https://github.com/96boards-hikey/edk2.git - EDK2_GIT_VERSION="origin/testing/hikey960_v2.5" - ATF_GIT_VERSION="origin/integration" - OPEN_PLATFORM_PKG_GIT_URL=https://github.com/96boards-hikey/OpenPlatformPkg.git - OPEN_PLATFORM_PKG_GIT_BRANCH="testing/hikey960_v1.3.4" - L_LOADER_GIT_URL=https://github.com/96boards-hikey/l-loader.git - L_LOADER_GIT_BRANCH="testing/hikey960_v1.2" -fi -if [ "${MX_PLATFORM}" = "hikey960" ]; then - EDK2_GIT_URL=https://github.com/96boards-hikey/edk2.git - EDK2_GIT_VERSION="origin/testing/hikey960_v2.5" - ATF_GIT_VERSION="origin/integration" - OPEN_PLATFORM_PKG_GIT_URL=https://github.com/96boards-hikey/OpenPlatformPkg.git - OPEN_PLATFORM_PKG_GIT_BRANCH="testing/hikey960_v1.3.4" - L_LOADER_GIT_URL=https://github.com/96boards-hikey/l-loader.git - L_LOADER_GIT_BRANCH="testing/hikey960_v1.2" - # HiKey960 support is added in OPTEE_OS > 2.5.0 - OPTEE_GIT_VERSION=3ff350a12d634bd7c4375ff347254977e9fb5a52 -fi +case "${MX_PLATFORM}" in + hikey|hikey960) + EDK2_GIT_URL=https://github.com/96boards-hikey/edk2.git + EDK2_GIT_VERSION="origin/testing/hikey960_v2.5" + ATF_GIT_VERSION="origin/integration" + OPEN_PLATFORM_PKG_GIT_URL=https://github.com/96boards-hikey/OpenPlatformPkg.git + OPEN_PLATFORM_PKG_GIT_BRANCH="testing/hikey960_v1.3.4" + L_LOADER_GIT_URL=https://github.com/96boards-hikey/l-loader.git + L_LOADER_GIT_BRANCH="testing/hikey960_v1.2" + ;; +esac # Force cap GCC build profile to GCC49, still preferred by upstream TOOLCHAIN=GCC49 |