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 --- travis build: https://travis-ci.org/hsdenx/u-boot-test/builds/615388594 https://dev.azure.com/hs0298/hs/_build/results?buildId=5

Changes in v3: - add changes also to azure pipeline, as it makes sense here to keep azure configuration in sync with travis configuration

Changes in v2: - collect in the layerscape jobs not only aarch64 based boards as Tom suggested. - change subject, old was "travis: split NXP ARM32 job"

.azure-pipelines.yml | 26 +++++++++++++------------- .travis.yml | 28 ++++++++++++++-------------- 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 44a76ebb09..cad8eea87b 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -312,19 +312,19 @@ jobs: 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: diff --git a/.travis.yml b/.travis.yml index d973aaa653..5da046ca7e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -183,27 +183,27 @@ matrix: - name: "buildman ARM bcm" env: - BUILDMAN="bcm -x mips" - - name: "buildman NXP ARM32" + - name: "buildman NXP ARM32 (catch-all)" 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: - - BUILDMAN="freescale&aarch64&ls101" - - name: "buildman NXP AArch64 LS102x" + - BUILDMAN="freescale&ls101" + - name: "buildman NXP LS102x" env: - - BUILDMAN="freescale&aarch64&ls102" - - name: "buildman NXP AArch64 LS104x" + - BUILDMAN="freescale&ls102" + - name: "buildman NXP LS104x" env: - - BUILDMAN="freescale&aarch64&ls104" - - name: "buildman NXP AArch64 LS108x" + - BUILDMAN="freescale&ls104" + - name: "buildman NXP LS108x" env: - - BUILDMAN="freescale&aarch64&ls108" - - name: "buildman NXP AArch64 LS20xx" + - BUILDMAN="freescale&ls108" + - name: "buildman NXP LS20xx" env: - - BUILDMAN="freescale&aarch64&ls20" - - name: "buildman NXP AArch64 LX216x" + - BUILDMAN="freescale&ls20" + - name: "buildman NXP LX216x" env: - - BUILDMAN="freescale&aarch64&lx216" + - BUILDMAN="freescale&lx216" - name: "buildman i.MX6 tqc" env: - BUILDMAN="mx6&tqc"