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>
This commit is contained in:
Tom Rini 2016-10-29 17:11:17 -04:00
parent 0cd82e255f
commit 5eba31c38e

View file

@ -27,6 +27,7 @@ addons:
- qemu-system-x86 - qemu-system-x86
- gcc-powerpc-linux-gnu - gcc-powerpc-linux-gnu
- gcc-arm-linux-gnueabihf - gcc-arm-linux-gnueabihf
- gcc-aarch64-linux-gnu
- iasl - iasl
install: install:
@ -54,7 +55,6 @@ env:
before_script: before_script:
# install toolchains based on TOOLCHAIN} variable # 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}" == *avr32* ]]; then ./tools/buildman/buildman --fetch-arch avr32 ; fi
- if [[ "${TOOLCHAIN}" == *bfin* ]]; then ./tools/buildman/buildman --fetch-arch bfin ; fi - if [[ "${TOOLCHAIN}" == *bfin* ]]; then ./tools/buildman/buildman --fetch-arch bfin ; fi
- if [[ "${TOOLCHAIN}" == *m68k* ]]; then ./tools/buildman/buildman --fetch-arch m68k ; fi - if [[ "${TOOLCHAIN}" == *m68k* ]]; then ./tools/buildman/buildman --fetch-arch m68k ; fi
@ -113,7 +113,8 @@ matrix:
- env: - env:
- BUILDMAN="denx" - BUILDMAN="denx"
- env: - env:
- BUILDMAN="freescale -x powerpc,m68k,aarch64" - JOB="Freescale ARM"
BUILDMAN="freescale -x powerpc,m68k"
- env: - env:
- BUILDMAN="sandbox x86" - BUILDMAN="sandbox x86"
TOOLCHAIN="x86_64" TOOLCHAIN="x86_64"
@ -155,11 +156,13 @@ matrix:
- env: - env:
- BUILDMAN="siemens" - BUILDMAN="siemens"
- env: - env:
- BUILDMAN="tegra -x aarch64" - BUILDMAN="tegra"
- env: - env:
- BUILDMAN="ti" - BUILDMAN="ti"
- env: - env:
- BUILDMAN="aarch64" - BUILDMAN="uniphier"
- env:
- BUILDMAN="aarch64 -x tegra,freescale,uniphier"
TOOLCHAIN="aarch64" TOOLCHAIN="aarch64"
- env: - env:
- BUILDMAN="sh4" - BUILDMAN="sh4"