MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-19 12:50:22 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

xen, rpi4: move rpi4-machine+xen-distro cfg into dynamic layer

Browse Source 
Improve meta-virt-xen.inc by moving all the Raspberry Pi 4 config
settings to a new xen-raspberrypi4-64.inc file in the raspberrypi
dynamic layer.

The new .inc file is included only for the raspberrypi4-64 MACHINE,
so the config settings no longer need to be applied using overrides.

Signed-off-by: Christopher Clark <christopher.w.clark@gmail.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
This commit is contained in:
Christopher Clark 2021-04-24 01:31:02 -07:00 committed by Bruce Ashfield
parent b882ebab22
commit 686adaf68e
2 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
conf/distro/include/meta-virt-xen.inc
View File

@ -5,20 +5,8 @@ PACKAGECONFIG_append_pn-qemu = " xen"
PACKAGECONFIG_append_pn-qemu_arm = " fdt" PACKAGECONFIG_append_pn-qemu_arm = " fdt"
PACKAGECONFIG_append_pn-qemu_aarch64 = " fdt" PACKAGECONFIG_append_pn-qemu_aarch64 = " fdt"
# Raspberry Pi settings # Xen on Raspberry Pi 4 64-bit support
# Xen uses u-boot for configuration and uses the uart XEN_RPI4_64_CONFIG_PATH ??= \
RPI_USE_U_BOOT_raspberrypi4-64 = "1" 'dynamic-layers/raspberrypi/conf/distro/include/xen-raspberrypi4-64.inc'
ENABLE_UART_raspberrypi4-64 = "1" include ${@bb.utils.contains('MACHINE', 'raspberrypi4-64', \
# Build the bootable SD card image '${XEN_RPI4_64_CONFIG_PATH}', '', d)}
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"

23
dynamic-layers/raspberrypi/conf/distro/include/xen-raspberrypi4-64.inc Normal file
View File

@ -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"