xen: retire the Raspberry Pi sdcard class

The sdcard class in the meta-raspberrypi layer is now extensible with
support for adding files such as hypervisor binaries to the boot
partition, so this layer can switch to use that and drop the custom
sdcard bbclass.

Uses the new RPI_SDIMG_EXTRA_DEPENDS and DEPLOYPAYLOAD variables,
and: IMAGE_CLASS: sdcard_image-rpi-xen => sdcard_image-rpi
    IMAGE_FSTYPE: rpi-xen-sdimg => rpi-sdimg

Please note that the filename suffix of the image is changed by this.

Also apply _raspberrypi4-64 scoping to the Raspberry Pi settings.

Signed-off-by: Christopher Clark <christopher.w.clark@gmail.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

1 files changed, 8 insertions, 5 deletions

diff --git a/conf/distro/include/meta-virt-xen.inc b/conf/distro/include/meta-virt-xen.inc
index b61f612a..1ad670ed 100644
--- a/conf/distro/include/meta-virt-xen.inc
+++ b/conf/distro/include/meta-virt-xen.inc
@@ -6,11 +6,14 @@ PACKAGECONFIG_append_pn-qemu_arm = " fdt"
 PACKAGECONFIG_append_pn-qemu_aarch64 = " fdt"
 
 # Raspberry Pi settings
-#  - Xen uses u-boot for configuration and uses the uart
-RPI_USE_U_BOOT = "1"
-ENABLE_UART = "1"
+# Xen uses u-boot for configuration and uses the uart
+RPI_USE_U_BOOT_raspberrypi4-64 = "1"
+ENABLE_UART_raspberrypi4-64 = "1"
 # Build the bootable SD card image
-IMAGE_CLASSES_append_raspberrypi4-64 = " sdcard_image-rpi-xen"
-IMAGE_FSTYPES_append_raspberrypi4-64 = " rpi-xen-sdimg"
+IMAGE_CLASSES_append_raspberrypi4-64 = " sdcard_image-rpi"
+IMAGE_FSTYPES_append_raspberrypi4-64 = " rpi-sdimg"
+# Add Xen to the bootable SD card image
+RPI_SDIMG_EXTRA_DEPENDS_append_raspberrypi4-64 = " xen:do_deploy"
+DEPLOYPAYLOAD_raspberrypi4-64 = "xen-${MACHINE}:xen"
 # Align kernel version with current meta-virtualization kernel version
 PREFERRED_VERSION_linux-raspberrypi ?= "5.4.%"