travis: rework NXP layerscape jobs

remove from NXP arm32 all layerscape boards and
build them instead in already existing layerscape
jobs (which now not only build aarch64 boards)

Signed-off-by: Heiko Schocher <hs@denx.de>

diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index 44a76ebb09b55234270f6f4bd1f0099de1a87602..cad8eea87bc46b9d3f796ec4fddb4154f01cba98 100644 (file)
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -312,19 +312,19 @@ jobs:
         arm_bcm:
           BUILDMAN: "bcm -x mips"
         nxp_arm32:
         arm_bcm:
           BUILDMAN: "bcm -x mips"
         nxp_arm32:

-          BUILDMAN: "freescale -x powerpc,m68k,aarch64"
-        nxp_aarch64_ls101x:
-          BUILDMAN: "freescale&aarch64&ls101"
-        nxp_aarch64_ls102x:
-          BUILDMAN: "freescale&aarch64&ls102"
-        nxp_aarch64_ls104x:
-          BUILDMAN: "freescale&aarch64&ls104"
-        nxp_aarch64_ls108x:
-          BUILDMAN: "freescale&aarch64&ls108"
-        nxp_aarch64_ls20xx:
-          BUILDMAN: "freescale&aarch64&ls20"
-        nxp_aarch64_lx216x:
-          BUILDMAN: "freescale&aarch64&lx216"
+          BUILDMAN: "freescale -x powerpc,m68k,aarch64,ls101,ls102,ls104,ls108,ls20,lx216"
+        nxp_ls101x:
+          BUILDMAN: "freescale&ls101"
+        nxp_ls102x:
+          BUILDMAN: "freescale&ls102"
+        nxp_ls104x:
+          BUILDMAN: "freescale&ls104"
+        nxp_ls108x:
+          BUILDMAN: "freescale&ls108"
+        nxp_ls20xx:
+          BUILDMAN: "freescale&ls20"
+        nxp_lx216x:
+          BUILDMAN: "freescale&lx216"

         imx6:
           BUILDMAN: "mx6 -x boundary,engicam,freescale,technexion,toradex"
         imx:
         imx6:
           BUILDMAN: "mx6 -x boundary,engicam,freescale,technexion,toradex"
         imx:

diff --git a/.travis.yml b/.travis.yml
index d973aaa653b715a8c79552f80c8c53c0ef7252e4..5da046ca7ed5dbd61533c99bd5d48be006ed80b0 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -183,27 +183,27 @@ matrix:
     - name: "buildman ARM bcm"
       env:
         - BUILDMAN="bcm -x mips"
     - name: "buildman ARM bcm"
       env:
         - BUILDMAN="bcm -x mips"

-    - name: "buildman NXP ARM32"
+    - name: "buildman NXP ARM32 (catch-all)"

       env:
       env:

-        - BUILDMAN="freescale -x powerpc,m68k,aarch64"
-    - name: "buildman NXP AArch64 LS101x"
+        - BUILDMAN="freescale -x powerpc,m68k,aarch64,ls101,ls102,ls104,ls108,ls20,lx216"
+    - name: "buildman NXP LS101x"

       env:
       env:

-        - BUILDMAN="freescale&aarch64&ls101"
-    - name: "buildman NXP AArch64 LS102x"
+        - BUILDMAN="freescale&ls101"
+    - name: "buildman NXP LS102x"

       env:
       env:

-        - BUILDMAN="freescale&aarch64&ls102"
-    - name: "buildman NXP AArch64 LS104x"
+        - BUILDMAN="freescale&ls102"
+    - name: "buildman NXP LS104x"

       env:
       env:

-        - BUILDMAN="freescale&aarch64&ls104"
-    - name: "buildman NXP AArch64 LS108x"
+        - BUILDMAN="freescale&ls104"
+    - name: "buildman NXP LS108x"

       env:
       env:

-        - BUILDMAN="freescale&aarch64&ls108"
-    - name: "buildman NXP AArch64 LS20xx"
+        - BUILDMAN="freescale&ls108"
+    - name: "buildman NXP LS20xx"

       env:
       env:

-        - BUILDMAN="freescale&aarch64&ls20"
-    - name: "buildman NXP AArch64 LX216x"
+        - BUILDMAN="freescale&ls20"
+    - name: "buildman NXP LX216x"

       env:
       env:

-        - BUILDMAN="freescale&aarch64&lx216"
+        - BUILDMAN="freescale&lx216"

     - name: "buildman i.MX6 tqc"
       env:
         - BUILDMAN="mx6&tqc"
     - name: "buildman i.MX6 tqc"
       env:
         - BUILDMAN="mx6&tqc"