- The catch-all i.MX6 job has been exceeding the time limit again so split this up further. We now have an i.MX6 job and an everything-else job. - The logic we use to say "Freescale and AArch64" can be more clearly expressed with '&' rather than excluding various other things, so clear that up.

Signed-off-by: Tom Rini trini@konsulko.com --- .travis.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml index 8333fae9b333..aaa7433840c3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -135,10 +135,13 @@ matrix: BUILDMAN="freescale -x powerpc,m68k,aarch64" - env: - JOB="Freescale AArch64" - BUILDMAN="freescale -x powerpc,m68k,armv7,arm9,arm11" + BUILDMAN="freescale&aarch64" - env: - - JOB="i.MX (non-Freescale)" - BUILDMAN="mx -x freescale" + - JOB="i.MX6 (non-Freescale)" + BUILDMAN="mx6 -x freescale" + - env: + - JOB="i.MX (non-Freescale, non-i.MX6)" + BUILDMAN="mx -x freescale,mx6" - env: - BUILDMAN="samsung" - env: