summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-10-29 17:11:17 -0400
committerTom Rini <trini@konsulko.com>2016-10-31 10:13:18 -0400
commit5eba31c38e1e22a949c5f7c22eb1905fc06d08e9 (patch)
tree1abcf0c267f36abaa6e160879515175ccf650b65
parent0cd82e255fb0960fd566459b1dbcb54b6b61504d (diff)
travis.yml: Add in uniphier as a job, modify aarch64 builds a bit
- Add in system aarch64-linux-gnu toolchain - Now that all VMs will have aarch64 available, don't exclude them from other jobs but instead exclude them from the catch-all aarch64 build - Add JOB= to the Freescale/ARM build to be clear about what it does. - Add uniphier as a stand-alone job Signed-off-by: Tom Rini <trini@konsulko.com>
-rw-r--r--.travis.yml11
1 files changed, 7 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index cda2d979ee..bb9325bacc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,6 +27,7 @@ addons:
- qemu-system-x86
- gcc-powerpc-linux-gnu
- gcc-arm-linux-gnueabihf
+ - gcc-aarch64-linux-gnu
- iasl
install:
@@ -54,7 +55,6 @@ env:
before_script:
# install toolchains based on TOOLCHAIN} variable
- - if [[ "${TOOLCHAIN}" == *aarch64* ]]; then ./tools/buildman/buildman --fetch-arch aarch64 ; fi
- if [[ "${TOOLCHAIN}" == *avr32* ]]; then ./tools/buildman/buildman --fetch-arch avr32 ; fi
- if [[ "${TOOLCHAIN}" == *bfin* ]]; then ./tools/buildman/buildman --fetch-arch bfin ; fi
- if [[ "${TOOLCHAIN}" == *m68k* ]]; then ./tools/buildman/buildman --fetch-arch m68k ; fi
@@ -113,7 +113,8 @@ matrix:
- env:
- BUILDMAN="denx"
- env:
- - BUILDMAN="freescale -x powerpc,m68k,aarch64"
+ - JOB="Freescale ARM"
+ BUILDMAN="freescale -x powerpc,m68k"
- env:
- BUILDMAN="sandbox x86"
TOOLCHAIN="x86_64"
@@ -155,11 +156,13 @@ matrix:
- env:
- BUILDMAN="siemens"
- env:
- - BUILDMAN="tegra -x aarch64"
+ - BUILDMAN="tegra"
- env:
- BUILDMAN="ti"
- env:
- - BUILDMAN="aarch64"
+ - BUILDMAN="uniphier"
+ - env:
+ - BUILDMAN="aarch64 -x tegra,freescale,uniphier"
TOOLCHAIN="aarch64"
- env:
- BUILDMAN="sh4"