From bac298017d5c1609f60a976f6f4ee5c9e9d9f5bf Mon Sep 17 00:00:00 2001 From: Luca Seritan <luca.seritan@huawei.com> Date: Wed, 10 Aug 2022 10:39:34 +0200 Subject: [PATCH] oniro-linux: Drop qemu-generic-arm64 support Signed-off-by: Luca Seritan <luca.seritan@huawei.com> --- meta-oniro-core/conf/distro/oniro-linux.conf | 8 -------- meta-oniro-core/recipes-kernel/linux/linux-oniro_5.10.bb | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/meta-oniro-core/conf/distro/oniro-linux.conf b/meta-oniro-core/conf/distro/oniro-linux.conf index f16630a7..494e21f2 100644 --- a/meta-oniro-core/conf/distro/oniro-linux.conf +++ b/meta-oniro-core/conf/distro/oniro-linux.conf @@ -73,11 +73,6 @@ PREFERRED_PROVIDER_virtual/kernel:qemux86-64 = "linux-oniro" PREFERRED_PROVIDER_virtual/kernel:qemuarm-efi = "linux-oniro" PREFERRED_PROVIDER_virtual/kernel:qemuarm64-efi = "linux-oniro" -# qemu-generic-arm64 has issues booting past 5.10. See: -# https://git.yoctoproject.org/meta-arm/tree/meta-arm/conf/machine/generic-arm64.conf?id=c40fb5348b1d0f8c4a1ed779c8df6ba3cf411930 -# When kernel version is bumped we will have to revisit here. -PREFERRED_PROVIDER_virtual/kernel_qemu-generic-arm64 = "linux-oniro" - # Prefer GRUB as the EFI provider. # # The SysOTA+RAUC stack supports GRUB as the point of integration. This is @@ -103,9 +98,6 @@ IMAGE_EFI_BOOT_FILES += "grubenv;EFI/BOOT/grubenv" # (note r-provider is used below) PREFERRED_RPROVIDER_virtual-grub-bootconf = "oniro-grub-bootconf" -# qemu-generic-arm64 specific requirements -PREFERRED_VERSION_optee-os:qemu-generic-arm64 = "3.14.0" - # Default to enabling serial debug console on RaspberryPi ENABLE_UART ?= "1" diff --git a/meta-oniro-core/recipes-kernel/linux/linux-oniro_5.10.bb b/meta-oniro-core/recipes-kernel/linux/linux-oniro_5.10.bb index d453b72d..8a4e3db7 100644 --- a/meta-oniro-core/recipes-kernel/linux/linux-oniro_5.10.bb +++ b/meta-oniro-core/recipes-kernel/linux/linux-oniro_5.10.bb @@ -28,7 +28,7 @@ PROVIDES="linux-oniro virtual/kernel" KCONF_BSP_AUDIT_LEVEL = "1" -COMPATIBLE_MACHINE = "^(qemux86|qemux86-64|qemuriscv64|qemuriscv32|qemu-generic-arm64)$" +COMPATIBLE_MACHINE = "^(qemux86|qemux86-64|qemuriscv64|qemuriscv32)$" # Functionality flags KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" -- GitLab