@@ -126,12 +126,6 @@ juno:
- TOOLCHAINS: [gcc, clang]
FIRMWARE: [uboot, edk2]
-microbit-v1:
- extends: .build
- parallel:
- matrix:
- - TESTING: testimage-zephyr
-
musca-b1:
extends: .build
@@ -144,18 +138,6 @@ n1sdp:
matrix:
- TOOLCHAINS: [gcc, armgcc]
-qemu-cortex-a53:
- extends: .build
-
-qemu-cortex-m3:
- extends: .build
- parallel:
- matrix:
- - TESTING: testimage-zephyr
-
-qemu-cortex-r5:
- extends: .build
-
qemu-generic-arm64:
extends: .build
parallel:
deleted file mode 100644
@@ -1,7 +0,0 @@
-header:
- version: 11
- includes:
- - ci/base.yml
- - ci/meta-zephyr.yml
-
-machine: microbit-v1
deleted file mode 100644
@@ -1,9 +0,0 @@
-header:
- version: 11
- includes:
- - ci/base.yml
- - ci/meta-zephyr.yml
-
-# FIXME - testimage fails all tests currently, but all the tests build
-
-machine: qemu-cortex-a53
deleted file mode 100644
@@ -1,20 +0,0 @@
-header:
- version: 11
- includes:
- - ci/base.yml
- - ci/meta-zephyr.yml
-
-repos:
- meta-zephyr:
- layers:
- meta-zephyr-bsp:
-
-local_conf_header:
- tclibc: |
- TCLIBC = "newlib"
- nonbuilding_tests: |
- ZEPHYRTESTS:remove = "common context pending poll sleep"
- qemu_opts: |
- QB_OPT_APPEND = "-icount shift=3,align=off,sleep=on -rtc clock=vm"
-
-machine: qemu-cortex-m3
deleted file mode 100644
@@ -1,11 +0,0 @@
-header:
- version: 11
- includes:
- - ci/base.yml
- - ci/meta-zephyr.yml
-
-local_conf_header:
- nonbuilding_tests: |
- ZEPHYRTESTS:remove = "common poll sleep queue device"
-
-machine: qemu-cortex-r5
deleted file mode 100644
@@ -1,22 +0,0 @@
-#@TYPE: Machine
-#@NAME: qemu_cortex_r5
-#@DESCRIPTION: Machine for Zephyr BOARD qemu_cortex_r5
-
-require conf/machine/include/qemu.inc
-require conf/machine/include/arm/armv7r/tune-cortexr5.inc
-
-# GLIBC will not work with Cortex-R.
-TCLIBC = "newlib"
-
-# For runqemu
-QB_SYSTEM_NAME = "qemu-system-aarch64"
-QB_MACHINE = "-machine xlnx-zcu102"
-QB_CPU = "-cpu cortex-r5"
-QB_MEM = "-m 64k"
-QB_GRAPHICS = "-nographic -vga none"
-QB_RNG = ""
-
-# Zephyr RTOS settings
-ZEPHYR_BOARD = "qemu_cortex_r5"
-ZEPHYR_INHERIT_CLASSES += "zephyr-qemuboot"
-ARCH:qemu-cortex-r5 = "arm"
deleted file mode 100644
@@ -1,24 +0,0 @@
-#@TYPE: Machine
-#@NAME: microbit_v1
-#@DESCRIPTION: Machine for BBC Microbit v1, Zephyr BOARD qemu_cortex_m0
-
-require conf/machine/include/qemu.inc
-require conf/machine/include/arm/armv6m/tune-cortexm0.inc
-
-MACHINEOVERRIDES =. "nordic:"
-
-# GLIBC will not work with Cortex-M.
-TCLIBC = "newlib"
-
-# For runqemu
-QB_SYSTEM_NAME = "qemu-system-arm"
-QB_MACHINE = "-machine microbit"
-QB_CPU = "-cpu cortex-m0"
-QB_GRAPHICS = "-nographic -vga none"
-QB_RNG = ""
-QB_OPT_APPEND = "-icount shift=6,align=off,sleep=on -rtc clock=vm"
-
-# Zephyr RTOS settings
-ZEPHYR_BOARD = "qemu_cortex_m0"
-ZEPHYR_INHERIT_CLASSES += "zephyr-qemuboot"
-ARCH:qemu-cortex-m0 = "arm"
deleted file mode 100644
@@ -1,19 +0,0 @@
-#@TYPE: Machine
-#@NAME: qemu-cortex-a53
-#@DESCRIPTION: Machine for Zephyr BOARD qemu_cortex_a53
-
-require conf/machine/include/qemu.inc
-require conf/machine/include/arm/armv8a/tune-cortexa53.inc
-
-TCLIBC = "newlib"
-
-# For runqemu
-QB_SYSTEM_NAME = "qemu-system-aarch64"
-QB_MACHINE = "-machine virt"
-QB_CPU = "-cpu cortex-a53"
-QB_GRAPHICS = "-nographic -vga none"
-
-# Zephyr RTOS settings
-ZEPHYR_BOARD = "qemu_cortex_a53"
-ZEPHYR_INHERIT_CLASSES += "zephyr-qemuboot"
-ARCH:qemu-cortex-a53 = "aarch64"
Remove microbit-v1, qemu-cortex-a53, qemu-cortex-m3, and qemu-cortex-r5 from CI (and the tree in general). These machines are part of the meta-zephyr CI now and keeping them here is redundant. However, keeping zephyr builds for machines that also have TF-M. Signed-off-by: Jon Mason <jon.mason@arm.com> --- .gitlab-ci.yml | 18 -------------- ci/microbit-v1.yml | 7 ------ ci/qemu-cortex-a53.yml | 9 ------- ci/qemu-cortex-m3.yml | 20 ---------------- ci/qemu-cortex-r5.yml | 11 --------- meta-arm-bsp/conf/machine/qemu-cortex-r5.conf | 22 ----------------- meta-arm/conf/machine/microbit-v1.conf | 24 ------------------- meta-arm/conf/machine/qemu-cortex-a53.conf | 19 --------------- 8 files changed, 130 deletions(-) delete mode 100644 ci/microbit-v1.yml delete mode 100644 ci/qemu-cortex-a53.yml delete mode 100644 ci/qemu-cortex-m3.yml delete mode 100644 ci/qemu-cortex-r5.yml delete mode 100644 meta-arm-bsp/conf/machine/qemu-cortex-r5.conf delete mode 100644 meta-arm/conf/machine/microbit-v1.conf delete mode 100644 meta-arm/conf/machine/qemu-cortex-a53.conf