[U-Boot] [PATCHv2 3/3] .travis.yml: Further optimizations

[Tom Rini]

- Xilinx aarch64 is caught in the general xilinx arm job, exclude from
  the general aarch64 job.
- Give the generic aarch64 job a better name
- Re-sort the PowerPC jobs so that we can complete them a bit quicker.

Signed-off-by: Tom Rini <trini at konsulko.com>
---
 .travis.yml | 36 +++++++++---------------------------
 1 file changed, 9 insertions(+), 27 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b07ce9b8ceb4..2326c3443c5d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -150,17 +150,11 @@ matrix:
         - BUILDMAN="arc"
           TOOLCHAIN="arc"
     - env:
-        - BUILDMAN="arm11"
-    - env:
-        - BUILDMAN="arm7"
-    - env:
-        - BUILDMAN="arm920t"
+        - BUILDMAN="arm11 arm7 arm920t arm946es"
     - env:
         - JOB="arm926ejs"
           BUILDMAN="arm926ejs -x mx,siemens,atmel"
     - env:
-        - BUILDMAN="arm946es"
-    - env:
         - BUILDMAN="atmel"
     - env:
         - BUILDMAN="aries"
@@ -168,7 +162,6 @@ matrix:
         - JOB="Boundary Devices"
           BUILDMAN="boundary"
     - env:
-        - JOB="engicam"
           BUILDMAN="engicam"
     - env:
         - JOB="Freescale ARM32"
@@ -227,19 +220,17 @@ matrix:
         - BUILDMAN="mips"
           TOOLCHAIN="mips"
     - env:
-        - BUILDMAN="mpc83xx"
+        - JOB="Non-Freescale PowerPC"
+          BUILDMAN="powerpc -x freescale"
           TOOLCHAIN="powerpc"
     - env:
-        - BUILDMAN="mpc85xx -x freescale"
+        - BUILDMAN="mpc85xx&freescale -x t208xrdb -x t4qds -x t102* -x p1_p2_rdb_pc -x p1010rdb -x corenet_ds -x b4860qds -x bsc91*"
           TOOLCHAIN="powerpc"
     - env:
-        - BUILDMAN="mpc85xx -x t208xrdb -x t4qds -x t102* -x p1_p2_rdb_pc -x p1010rdb -x corenet_ds -x b4860qds -x sbc8548 -x bsc91*"
+        - BUILDMAN="t208xrdb corenet_ds"
           TOOLCHAIN="powerpc"
     - env:
-        - BUILDMAN="t208xrdb"
-          TOOLCHAIN="powerpc"
-    - env:
-        - BUILDMAN="t4qds"
+        - BUILDMAN="t4qds b4860qds mpc83xx&freescale mpc86xx&freescale"
           TOOLCHAIN="powerpc"
     - env:
         - BUILDMAN="t102*"
@@ -248,16 +239,7 @@ matrix:
         - BUILDMAN="p1_p2_rdb_pc"
           TOOLCHAIN="powerpc"
     - env:
-        - BUILDMAN="p1010rdb"
-          TOOLCHAIN="powerpc"
-    - env:
-        - BUILDMAN="corenet_ds b4860qds sbc8548 bsc91*"
-          TOOLCHAIN="powerpc"
-    - env:
-        - BUILDMAN="mpc86xx"
-          TOOLCHAIN="powerpc"
-    - env:
-        - BUILDMAN="mpc8xx"
+        - BUILDMAN="p1010rdb bsc91"
           TOOLCHAIN="powerpc"
     - env:
         - BUILDMAN="siemens"
@@ -276,8 +258,8 @@ matrix:
     - env:
         - BUILDMAN="uniphier"
     - env:
-        - JOB="aarch64"
-          BUILDMAN="aarch64 -x tegra,freescale,mvebu,uniphier,sunxi,samsung,rockchip"
+        - JOB="Catch-all AArch64"
+          BUILDMAN="aarch64 -x tegra,freescale,mvebu,uniphier,sunxi,samsung,rockchip,xilinx"
     - env:
         - BUILDMAN="rockchip"
     - env:
-- 
2.7.4