From 337ae20576d4447a06eb7bca77c7b89fb6c7b2e1 Mon Sep 17 00:00:00 2001 From: Christopher Clark Date: Sat, 24 Apr 2021 01:30:59 -0700 Subject: xen, rpi4: switch Xen-on-Rpi4 kernel preference to linux-yocto The 5.10 version of the Linux Yocto kernel supports running Xen on the Raspberry Pi 4, so the previous preference for linux-yocto-dev can be replaced. Use the ?= operator to set the kernel preference now since meta-raspberrypi commit e0b4b8c5d introduced use of the weak default for kernel preference in that layer to allow this here. KERNEL_DEVICETREE needs to be set to match the build outputs of the selected kernel, in this case: "broadcom/bcm2711-rpi-4-b.dtb" Tested with kernel version: SRCREV_machine = "cf5b0320cf4544d3db9ce3ddd6ddb7553a610651" SRCREV_meta="031f6c76e488a3563f35258c72ff1de3e25a512e" Signed-off-by: Christopher Clark Signed-off-by: Bruce Ashfield --- conf/distro/include/meta-virt-xen.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/distro/include/meta-virt-xen.inc b/conf/distro/include/meta-virt-xen.inc index 44853d95..584cd6eb 100644 --- a/conf/distro/include/meta-virt-xen.inc +++ b/conf/distro/include/meta-virt-xen.inc @@ -20,4 +20,5 @@ RPI_EXTRA_CONFIG_append_raspberrypi4-64 = "\nenable_gic=1" # Increase boot partition for space for kernel and Xen BOOT_SPACE_raspberrypi4-64 = "61440" # Override the meta-raspberrypi default kernel preference -PREFERRED_PROVIDER_virtual/kernel_raspberrypi4-64 = "linux-yocto-dev" +PREFERRED_PROVIDER_virtual/kernel_raspberrypi4-64 ?= "linux-yocto" +KERNEL_DEVICETREE_raspberrypi4-64 ?= "broadcom/bcm2711-rpi-4-b.dtb" -- cgit v1.2.3-54-g00ecf