2 files changed, 28 insertions, 17 deletions

diff --git a/conf/distro/include/meta-virt-xen.inc b/conf/distro/include/meta-virt-xen.inc
index 584cd6eb..02a78105 100644
--- a/conf/distro/include/meta-virt-xen.inc
+++ b/conf/distro/include/meta-virt-xen.inc
@@ -5,20 +5,8 @@ PACKAGECONFIG_append_pn-qemu = " xen"
 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_raspberrypi4-64 = "1"
-ENABLE_UART_raspberrypi4-64 = "1"
-# Build the bootable SD card image
-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"
-# We need the GIC enabled for Xen to work
-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"
-KERNEL_DEVICETREE_raspberrypi4-64 ?= "broadcom/bcm2711-rpi-4-b.dtb"
+# Xen on Raspberry Pi 4 64-bit support
+XEN_RPI4_64_CONFIG_PATH ??= \
+    'dynamic-layers/raspberrypi/conf/distro/include/xen-raspberrypi4-64.inc'
+include ${@bb.utils.contains('MACHINE', 'raspberrypi4-64', \
+    '${XEN_RPI4_64_CONFIG_PATH}', '', d)}
diff --git a/dynamic-layers/raspberrypi/conf/distro/include/xen-raspberrypi4-64.inc b/dynamic-layers/raspberrypi/conf/distro/include/xen-raspberrypi4-64.inc
new file mode 100644
index 00000000..9c362551
--- /dev/null
+++ b/dynamic-layers/raspberrypi/conf/distro/include/xen-raspberrypi4-64.inc
@@ -0,0 +1,23 @@
+# Xen on Raspberry Pi 4 settings
+
+# Xen uses u-boot for configuration and uses the uart
+RPI_USE_U_BOOT = "1"
+ENABLE_UART = "1"
+
+# Build the bootable SD card image
+IMAGE_CLASSES_append = " sdcard_image-rpi"
+IMAGE_FSTYPES_append = " rpi-sdimg"
+
+# Add Xen to the bootable SD card image
+RPI_SDIMG_EXTRA_DEPENDS_append = " xen:do_deploy"
+DEPLOYPAYLOAD = "xen-${MACHINE}:xen"
+
+# We need the GIC enabled for Xen to work
+RPI_EXTRA_CONFIG_append  = "\nenable_gic=1"
+
+# Increase boot partition for space for kernel and Xen
+BOOT_SPACE = "61440"
+
+# Override the meta-raspberrypi default kernel preference
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
+KERNEL_DEVICETREE ?= "broadcom/bcm2711-rpi-4-b.dtb"