From 3c9486fb313fe8bbd59aee0b8c83b2894013e3de Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 9 Dec 2020 10:57:14 +0000 Subject: [PATCH] arm/qemuarm64-secureboot: don't use -dev kernel According to the comment linux-yocto-dev was being used to get a 5.5 kernel as 5.4 was panicking on boot. Now linux-yocto defaults to 5.8 so just use the standard kernel instead. Change-Id: Id382c69f16f2ff4b2cbc63be94a645e56616549d Signed-off-by: Ross Burton Signed-off-by: Jon Mason --- meta-arm/conf/machine/qemuarm64-secureboot.conf | 5 ----- 1 file changed, 5 deletions(-) diff --git a/meta-arm/conf/machine/qemuarm64-secureboot.conf b/meta-arm/conf/machine/qemuarm64-secureboot.conf index f2c15e61..fe19ed27 100644 --- a/meta-arm/conf/machine/qemuarm64-secureboot.conf +++ b/meta-arm/conf/machine/qemuarm64-secureboot.conf @@ -6,10 +6,6 @@ KMACHINE = "qemuarm64" UBOOT_MACHINE = "qemu_arm64_defconfig" -# The 5.4 kernel panics when booting, so use the development kernel until the -# default kernel is upgraded (5.5. supposedly works) -PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-dev" - QB_MACHINE = "-machine virt,secure=on" QB_OPT_APPEND += "-no-acpi" QB_MEM = "-m 1024" @@ -23,4 +19,3 @@ IMAGE_FSTYPES += "wic wic.qcow2" WKS_FILE ?= "qemuarm64.wks" WKS_FILE_DEPENDS = "trusted-firmware-a" IMAGE_BOOT_FILES = "${KERNEL_IMAGETYPE}" -