diff mbox series

[5/6] arm: remove generic-arm64 and qemu-generic-arm64

Message ID 20240422133739.190536-5-ross.burton@arm.com
State New
Headers show
Series [1/6] arm-bsp/linux-yocto-rt: include linux-arm-platforms unconditionally | expand

Commit Message

Ross Burton April 22, 2024, 1:37 p.m. UTC 
These BSPs are now obsolete.

Users of generic-arm64 should use genericarm64 from meta-yocto-bsp.

Users of qemu-generic-arm64 should use sbsa-ref from meta-arm-bsp.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .gitlab-ci.yml                                | 13 -------
 ci/generic-arm64.yml                          |  6 ----
 ci/qemu-generic-arm64.yml                     | 14 --------
 meta-arm/conf/machine/generic-arm64.conf      | 25 --------------
 meta-arm/conf/machine/qemu-generic-arm64.conf | 34 -------------------
 .../trusted-firmware-a_%.bbappend             |  3 --
 .../recipes-bsp/uefi/edk2-firmware_%.bbappend | 18 ----------
 .../generic-arm64-preempt-rt-tweaks.cfg       |  4 ---
 .../generic-arm64-preempt-rt.scc              |  7 ----
 .../generic-arm64-standard.scc                |  6 ----
 .../linux/linux-yocto%.bbappend               |  6 ----
 .../optee-ftpm/optee-ftpm_git.bb              |  1 -
 meta-arm/recipes-security/optee/optee.inc     |  1 -
 13 files changed, 138 deletions(-)
 delete mode 100644 ci/generic-arm64.yml
 delete mode 100644 ci/qemu-generic-arm64.yml
 delete mode 100644 meta-arm/conf/machine/generic-arm64.conf
 delete mode 100644 meta-arm/conf/machine/qemu-generic-arm64.conf
 delete mode 100644 meta-arm/recipes-kernel/linux/files/generic-arm64-kmeta/generic-arm64-preempt-rt-tweaks.cfg
 delete mode 100644 meta-arm/recipes-kernel/linux/files/generic-arm64-kmeta/generic-arm64-preempt-rt.scc
 delete mode 100644 meta-arm/recipes-kernel/linux/files/generic-arm64-kmeta/generic-arm64-standard.scc
diff mbox series

Patch

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e94ea733..a0d25063 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -169,9 +169,6 @@  genericarm64:
       - KERNEL: linux-yocto-dev
         TESTING: testimage
 
-generic-arm64:
-  extends: .build
-
 sbsa-ref:
   extends: .build
   parallel:
@@ -201,16 +198,6 @@  n1sdp:
     matrix:
       - TESTING: [none, n1sdp-ts, n1sdp-optee, tftf]
 
-qemu-generic-arm64:
-  extends: .build
-  parallel:
-    matrix:
-      - KERNEL: [linux-yocto, linux-yocto-rt]
-        TOOLCHAINS: [gcc, clang]
-        TESTING: testimage
-      - KERNEL: linux-yocto-dev
-        TESTING: testimage
-
 qemuarm64-secureboot:
   extends: .build
   parallel:
diff --git a/ci/generic-arm64.yml b/ci/generic-arm64.yml
deleted file mode 100644
index 5d944ef1..00000000
--- a/ci/generic-arm64.yml
+++ /dev/null
@@ -1,6 +0,0 @@ 
-header:
-  version: 14
-  includes:
-    - ci/base.yml
-
-machine: generic-arm64
diff --git a/ci/qemu-generic-arm64.yml b/ci/qemu-generic-arm64.yml
deleted file mode 100644
index 43ae2563..00000000
--- a/ci/qemu-generic-arm64.yml
+++ /dev/null
@@ -1,14 +0,0 @@ 
-header:
-  version: 14
-  includes:
-    - ci/generic-arm64.yml
-
-local_conf_header:
-  failing_tests: |
-    DEFAULT_TEST_SUITES:remove = "parselogs"
-
-machine: qemu-generic-arm64
-
-target:
-  - core-image-sato
-  - sbsa-acs
diff --git a/meta-arm/conf/machine/generic-arm64.conf b/meta-arm/conf/machine/generic-arm64.conf
deleted file mode 100644
index 9594e041..00000000
--- a/meta-arm/conf/machine/generic-arm64.conf
+++ /dev/null
@@ -1,25 +0,0 @@ 
-#@TYPE: Machine
-#@NAME: generic-arm64
-#@DESCRIPTION: Generic Arm64 machine for typical SystemReady platforms, which
-#have working firmware and boot via EFI.
-
-require conf/machine/include/arm/arch-armv8a.inc
-
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-KBUILD_DEFCONFIG = "defconfig"
-KCONFIG_MODE = "--alldefconfig"
-KERNEL_IMAGETYPE = "Image"
-MACHINE_EXTRA_RRECOMMENDS += "kernel-modules linux-firmware"
-
-IMAGE_FSTYPES ?= "wic"
-WKS_FILE ?= "efi-disk.wks.in"
-EFI_PROVIDER ?= "${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd-boot", "grub-efi", d)}"
-
-MACHINE_FEATURES:append = " alsa bluetooth efi qemu-usermode rtc screen usbhost vfat wifi"
-
-SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0"
-
-XSERVER ?= "xserver-xorg \
-            xf86-video-fbdev \
-            xf86-video-modesetting \
-            "
diff --git a/meta-arm/conf/machine/qemu-generic-arm64.conf b/meta-arm/conf/machine/qemu-generic-arm64.conf
deleted file mode 100644
index 6925854f..00000000
--- a/meta-arm/conf/machine/qemu-generic-arm64.conf
+++ /dev/null
@@ -1,34 +0,0 @@ 
-#@TYPE: Machine
-#@NAME: qemu-generic-arm64
-#@DESCRIPTION: Generic Arm64 machine for typical SystemReady platforms, which
-#have working firmware and boot via EFI.
-
-MACHINEOVERRIDES =. "generic-arm64:"
-
-require conf/machine/generic-arm64.conf
-require conf/machine/include/qemu.inc
-
-EXTRA_IMAGEDEPENDS += "edk2-firmware"
-
-# This unique WIC file is necessary because kernel boot args cannot be passed
-# because there is no default kernel (see below).  There is no default kernel
-# because QEMU will only allow firmware or kernel to be passed in as a
-# parameter, and we need the firmware.  So, to allow for "ip=dhcp" as a kernel
-# boot arg (which we need for testimage), we have to have a WIC file unique to
-# this platform.
-WKS_FILE = "qemu-efi-disk.wks.in"
-IMAGE_FSTYPES += "wic.qcow2"
-
-QB_SYSTEM_NAME = "qemu-system-aarch64"
-QB_MACHINE = "-machine sbsa-ref"
-QB_MEM = "-m 1024"
-QB_DEFAULT_FSTYPE = "wic.qcow2"
-QB_NETWORK_DEVICE = "-device virtio-net-pci,netdev=net0,mac=@MAC@"
-QB_DRIVE_TYPE = "/dev/hd"
-QB_ROOTFS_OPT = "-drive file=@ROOTFS@,if=ide,format=qcow2"
-QB_DEFAULT_KERNEL = "none"
-QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd -pflash @DEPLOY_DIR_IMAGE@/SBSA_FLASH0.fd -pflash @DEPLOY_DIR_IMAGE@/SBSA_FLASH1.fd"
-QB_SERIAL_OPT = "-device virtio-serial-pci -chardev null,id=virtcon -device virtconsole,chardev=virtcon"
-QB_TCPSERIAL_OPT = "-device virtio-serial-pci -chardev socket,id=virtcon,port=@PORT@,host=127.0.0.1 -device virtconsole,chardev=virtcon"
-# sbsa-ref is a true virtual machine so can't use KVM
-QEMU_USE_KVM = "0"
diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
index b3624bb3..3d42a97c 100644
--- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
+++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
@@ -1,5 +1,4 @@ 
 COMPATIBLE_MACHINE:qemuarm64-secureboot = "qemuarm64-secureboot"
-COMPATIBLE_MACHINE:qemu-generic-arm64 = "qemu-generic-arm64"
 COMPATIBLE_MACHINE:qemuarm-secureboot = "qemuarm-secureboot"
 
 #FIXME - clang fails to build tfa for qemuarm-secureboot, and possibly other
@@ -14,7 +13,6 @@  SRC_URI:append:qemuarm64-secureboot = " \
         "
 
 TFA_PLATFORM:qemuarm64-secureboot = "qemu"
-TFA_PLATFORM:qemu-generic-arm64 = "qemu_sbsa"
 TFA_PLATFORM:qemuarm-secureboot = "qemu"
 
 # Trusted Services secure partitions require arm-ffa machine feature.
@@ -32,7 +30,6 @@  TFA_BUILD_TARGET:aarch64:qemuall = "all fip"
 TFA_BUILD_TARGET:arm:qemuall = "all fip"
 
 TFA_INSTALL_TARGET:qemuarm64-secureboot = "flash.bin"
-TFA_INSTALL_TARGET:qemu-generic-arm64 = "bl1 fip"
 TFA_INSTALL_TARGET:qemuarm-secureboot = "flash.bin"
 
 DEPENDS:append:aarch64:qemuall = " optee-os"
diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend b/meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend
index 7a39bb03..e923d9f0 100644
--- a/meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend
+++ b/meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend
@@ -13,24 +13,6 @@  EDK2_PLATFORM:qemuarm      = "ArmVirtQemu-ARM"
 EDK2_PLATFORM_DSC:qemuarm  = "ArmVirtPkg/ArmVirtQemu.dsc"
 EDK2_BIN_NAME:qemuarm      = "QEMU_EFI.fd"
 
-COMPATIBLE_MACHINE:qemu-generic-arm64   = "qemu-generic-arm64"
-DEPENDS:append:qemu-generic-arm64       = " trusted-firmware-a coreutils-native"
-EDK2_PLATFORM:qemu-generic-arm64        = "SbsaQemu"
-EDK2_PLATFORM_DSC:qemu-generic-arm64    = "Platform/Qemu/SbsaQemu/SbsaQemu.dsc"
-EDK2_BIN_NAME:qemu-generic-arm64        = "SBSA_FLASH0.fd"
-
-do_compile:prepend:qemu-generic-arm64() {
-    mkdir -p ${B}/Platform/Qemu/Sbsa/
-    cp ${RECIPE_SYSROOT}/firmware/bl1.bin ${B}/Platform/Qemu/Sbsa/
-    cp ${RECIPE_SYSROOT}/firmware/fip.bin ${B}/Platform/Qemu/Sbsa/
-}
-
-do_install:append:qemu-generic-arm64() {
-    install ${B}/Build/${EDK2_PLATFORM}/${EDK2_BUILD_MODE}_${EDK_COMPILER}/FV/SBSA_FLASH*.fd ${D}/firmware/
-    # QEMU requires that the images be minimum of 256M in size
-    truncate -s 256M ${D}/firmware/SBSA_FLASH*.fd
-}
-
 do_install:append:qemuarm64() {
     install ${B}/Build/${EDK2_PLATFORM}/${EDK2_BUILD_MODE}_${EDK_COMPILER}/FV/${EDK2_BIN_NAME} ${D}/firmware/
 }
diff --git a/meta-arm/recipes-kernel/linux/files/generic-arm64-kmeta/generic-arm64-preempt-rt-tweaks.cfg b/meta-arm/recipes-kernel/linux/files/generic-arm64-kmeta/generic-arm64-preempt-rt-tweaks.cfg
deleted file mode 100644
index 84e0dd71..00000000
--- a/meta-arm/recipes-kernel/linux/files/generic-arm64-kmeta/generic-arm64-preempt-rt-tweaks.cfg
+++ /dev/null
@@ -1,4 +0,0 @@ 
-# These configurations have a dependency on !PREEMPT_RT. Set them to `n` to
-# avoid complain when do_kernel_configcheck.
-CONFIG_LEDS_TRIGGER_CPU=n
-CONFIG_TRANSPARENT_HUGEPAGE=n
diff --git a/meta-arm/recipes-kernel/linux/files/generic-arm64-kmeta/generic-arm64-preempt-rt.scc b/meta-arm/recipes-kernel/linux/files/generic-arm64-kmeta/generic-arm64-preempt-rt.scc
deleted file mode 100644
index ae97c2e2..00000000
--- a/meta-arm/recipes-kernel/linux/files/generic-arm64-kmeta/generic-arm64-preempt-rt.scc
+++ /dev/null
@@ -1,7 +0,0 @@ 
-define KMACHINE generic-arm64
-define KTYPE preempt-rt
-define KARCH arm64
-
-kconf hardware generic-arm64-preempt-rt-tweaks.cfg
-include ktypes/preempt-rt/preempt-rt.scc
-include features/bluetooth/bluetooth.scc
diff --git a/meta-arm/recipes-kernel/linux/files/generic-arm64-kmeta/generic-arm64-standard.scc b/meta-arm/recipes-kernel/linux/files/generic-arm64-kmeta/generic-arm64-standard.scc
deleted file mode 100644
index 70364769..00000000
--- a/meta-arm/recipes-kernel/linux/files/generic-arm64-kmeta/generic-arm64-standard.scc
+++ /dev/null
@@ -1,6 +0,0 @@ 
-define KMACHINE generic-arm64
-define KTYPE standard
-define KARCH arm64
-
-include ktypes/standard/standard.scc
-include features/bluetooth/bluetooth.scc
diff --git a/meta-arm/recipes-kernel/linux/linux-yocto%.bbappend b/meta-arm/recipes-kernel/linux/linux-yocto%.bbappend
index c4e351bb..a287d0e1 100644
--- a/meta-arm/recipes-kernel/linux/linux-yocto%.bbappend
+++ b/meta-arm/recipes-kernel/linux/linux-yocto%.bbappend
@@ -1,11 +1,5 @@ 
 ARMFILESPATHS := "${THISDIR}/files:"
 
-COMPATIBLE_MACHINE:generic-arm64 = "generic-arm64"
-FILESEXTRAPATHS:prepend:generic-arm64 = "${ARMFILESPATHS}"
-SRC_URI:append:generic-arm64 = " \
-    file://generic-arm64-kmeta;type=kmeta;destsuffix=generic-arm64-kmeta \
-    "
-
 FILESEXTRAPATHS:prepend:qemuarm64-secureboot = "${ARMFILESPATHS}"
 SRC_URI:append:qemuarm64-secureboot = " \
     file://tee.cfg \
diff --git a/meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb b/meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb
index 1bb76819..d5f6e01d 100644
--- a/meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb
+++ b/meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb
@@ -5,7 +5,6 @@  HOMEPAGE = "https://github.com/microsoft/ms-tpm-20-ref/"
 COMPATIBLE_MACHINE ?= "invalid"
 COMPATIBLE_MACHINE:qemuarm64 = "qemuarm64"
 COMPATIBLE_MACHINE:qemuarm64-secureboot = "qemuarm64"
-COMPATIBLE_MACHINE:qemu-generic-arm64 = "qemu-generic-arm64"
 COMPATIBLE_MACHINE:qemuarm-secureboot = "qemuarm"
 
 #FIXME - doesn't currently work with clang
diff --git a/meta-arm/recipes-security/optee/optee.inc b/meta-arm/recipes-security/optee/optee.inc
index 1569a9df..37676f14 100644
--- a/meta-arm/recipes-security/optee/optee.inc
+++ b/meta-arm/recipes-security/optee/optee.inc
@@ -2,7 +2,6 @@  UPSTREAM_CHECK_GITTAGREGEX = "^(?P<pver>\d+(\.\d+)+)$"
 
 COMPATIBLE_MACHINE ?= "invalid"
 COMPATIBLE_MACHINE:qemuarm64 ?= "qemuarm64"
-COMPATIBLE_MACHINE:qemu-generic-arm64 ?= "qemu-generic-arm64"
 COMPATIBLE_MACHINE:qemuarm ?= "qemuarm"
 # Please add supported machines below or set it in .bbappend or .conf