UPSTREAM: Travis-CI: Fix microblaze and xilinx jobs

Given how we handle the ARM toolchain we can't easily combine these two
jobs, so don't.  Give xilinx/ARM a separate build.

Change-Id: I438104c5eb54fe89dd72d55df6240bb0d4de8c0f
Signed-off-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
(cherry picked from commit 0d3aaa35b87573c229d65bc79050ab13f39d8ec2)
This commit is contained in:
Tom Rini 2017-10-07 15:54:18 -04:00 committed by Kever Yang
parent 017aad0449
commit e6d8fad507
1 changed files with 4 additions and 2 deletions

View File

@ -194,8 +194,7 @@ matrix:
- BUILDMAN="m68k" - BUILDMAN="m68k"
TOOLCHAIN="m68k" TOOLCHAIN="m68k"
- env: - env:
- JOB="Xilinx (ARM and MicroBlaze)" - BUILDMAN="microblaze"
BUILDMAN="xilinx"
TOOLCHAIN="microblaze" TOOLCHAIN="microblaze"
- env: - env:
- BUILDMAN="mips" - BUILDMAN="mips"
@ -242,6 +241,9 @@ matrix:
- env: - env:
- BUILDMAN="sh4" - BUILDMAN="sh4"
TOOLCHAIN="sh4" TOOLCHAIN="sh4"
- env:
- JOB="Xilinx (ARM)"
BUILDMAN="xilinx -x microblaze"
- env: - env:
- BUILDMAN="xtensa" - BUILDMAN="xtensa"
TOOLCHAIN="xtensa" TOOLCHAIN="xtensa"