From 818408e203c7d5b6c2d49f5dff490fa2f6dd6e2e Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 23 Oct 2018 11:58:44 -0400 Subject: travis: Rework Freescale ARM jobs a bit - Split the AArch64 LS10xx and LS20xx builds into their own jobs, and then exclude only ls1/ls2 from the catch-all. This moves the S32V234 job (and future i.MX8*) to the catch-all. - Split spear out from arm926ejs and exclude freescale, not mx from that job. The older Freescale i.MX boards are caught by the catch-all job for Freescale but now we build the non-Freescale older i.MX platforms. Signed-off-by: Tom Rini --- .travis.yml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 03ab70fc7e..6ce2ef7fba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -164,10 +164,10 @@ matrix: - name: "buildman arm11 arm7 arm920t arm946es" env: - BUILDMAN="arm11 arm7 arm920t arm946es" - - name: "buildman arm926ejs (non-mx,siemens,atmel,kirkwood)" + - name: "buildman arm926ejs (non-freescale,siemens,atmel,kirkwood,spear)" env: - JOB="arm926ejs" - BUILDMAN="arm926ejs -x mx,siemens,atmel,kirkwood" + BUILDMAN="arm926ejs -x freescale,siemens,atmel,kirkwood,spear" - name: "buildman atmel" env: - BUILDMAN="atmel" @@ -177,9 +177,12 @@ matrix: - name: "buildman Freescale ARM32" env: - BUILDMAN="freescale -x powerpc,m68k,aarch64" - - name: "buildman Freescale AArch64" + - name: "buildman Freescale AArch64 LS10xx" env: - - BUILDMAN="freescale&aarch64" + - BUILDMAN="freescale&aarch64&&ls1" + - name: "buildman Freescale AArch64 LS20xx" + env: + - BUILDMAN="freescale&aarch64&&ls2" - name: "buildman i.MX6 (non-Freescale)" env: - BUILDMAN="mx6 -x freescale,toradex,boundary,engicam" @@ -192,6 +195,9 @@ matrix: - name: "buildman samsung socfpga" env: - BUILDMAN="samsung socfpga" + - name: "buildman spear" + env: + - BUILDMAN="spear" - name: "buildman sun4i" env: - BUILDMAN="sun4i" @@ -286,7 +292,7 @@ matrix: - BUILDMAN="uniphier" - name: "buildman catch-all AArch64" env: - - BUILDMAN="aarch64 -x tegra,freescale,mvebu,uniphier,sunxi,samsung,rockchip,xilinx" + - BUILDMAN="aarch64 -x tegra,ls1,ls2,mvebu,uniphier,sunxi,samsung,rockchip,xilinx" - name: "buildman rockchip" env: - BUILDMAN="rockchip" -- cgit v1.2.3