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

xen, rpi4: use RPI_EXTRA_CONFIG and drop the rpi-config_git.bbappend

Browse Source 
The GIC that is needed by Xen can be enabled via the rpi-config recipe
variable. Fixes the build after the upstream recipe changed recently.

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 2020-08-07 00:05:01 -07:00 committed by Bruce Ashfield
parent 681591b5b8
commit 738bd333a9
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,5 +15,7 @@ IMAGE_FSTYPES_append_raspberrypi4-64 = " rpi-sdimg"
# Add Xen to the bootable SD card image # Add Xen to the bootable SD card image
RPI_SDIMG_EXTRA_DEPENDS_append_raspberrypi4-64 = " xen:do_deploy" RPI_SDIMG_EXTRA_DEPENDS_append_raspberrypi4-64 = " xen:do_deploy"
DEPLOYPAYLOAD_raspberrypi4-64 = "xen-${MACHINE}:xen" DEPLOYPAYLOAD_raspberrypi4-64 = "xen-${MACHINE}:xen"
# We need the GIC enabled for Xen to work
RPI_EXTRA_CONFIG_append_raspberrypi4-64 = "\nenable_gic=1"
# Align kernel version with current meta-virtualization kernel version # Align kernel version with current meta-virtualization kernel version
PREFERRED_VERSION_linux-raspberrypi ?= "5.4.%" PREFERRED_VERSION_linux-raspberrypi ?= "5.4.%"

6
dynamic-layers/raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend
View File

@ -1,6 +0,0 @@
do_deploy_append() {
# We need the GIC enabled for Xen to work.
if [ "${@bb.utils.contains('DISTRO_FEATURES', 'xen', 'yes', 'no', d)}" = "yes" ]; then
echo "enable_gic=1" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
fi
}