Merge branch 'master' of git://git.denx.de/u-boot-sunxi

[u-boot] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 7e90bc9b367e0c41d3464994122943b8dae70b8f..7b0eb6e4f6b576267157a977ad3205cadd8fbb2a 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -156,8 +156,6 @@ matrix:
           BUILDMAN="arm926ejs -x mx,siemens,atmel"
     - env:
         - BUILDMAN="atmel"
-    - env:
-        - BUILDMAN="aries"
     - env:
           BUILDMAN="boundary engicam toradex"
     - env:
@@ -192,7 +190,7 @@ matrix:
         - BUILDMAN="sun50i"
     - env:
         - JOB="Catch-all ARM"
-          BUILDMAN="arm -x arm11,arm7,arm9,aarch64,atmel,aries,freescale,kirkwood,mvebu,siemens,tegra,uniphier,mx,samsung,sunxi,am33xx,omap,pxa,rockchip,toradex,socfpga,k2,xilinx"
+          BUILDMAN="arm -x arm11,arm7,arm9,aarch64,atmel,freescale,kirkwood,mvebu,siemens,tegra,uniphier,mx,samsung,sunxi,am33xx,omap,pxa,rockchip,toradex,socfpga,k2,xilinx"
     - env:
         - BUILDMAN="sandbox x86"
           TOOLCHAIN="x86_64"