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)

.travis.yml

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