From 738bd333a9d3d39b12643efd1f1afe60d0e3080d Mon Sep 17 00:00:00 2001 From: Christopher Clark Date: Fri, 7 Aug 2020 00:05:01 -0700 Subject: [PATCH] xen, rpi4: use RPI_EXTRA_CONFIG and drop the rpi-config_git.bbappend 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 Signed-off-by: Bruce Ashfield --- conf/distro/include/meta-virt-xen.inc | 2 ++ .../recipes-bsp/bootfiles/rpi-config_git.bbappend | 6 ------ 2 files changed, 2 insertions(+), 6 deletions(-) delete mode 100644 dynamic-layers/raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend diff --git a/conf/distro/include/meta-virt-xen.inc b/conf/distro/include/meta-virt-xen.inc index 1ad670ed..fe3fd221 100644 --- a/conf/distro/include/meta-virt-xen.inc +++ b/conf/distro/include/meta-virt-xen.inc @@ -15,5 +15,7 @@ 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" # Align kernel version with current meta-virtualization kernel version PREFERRED_VERSION_linux-raspberrypi ?= "5.4.%" diff --git a/dynamic-layers/raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend b/dynamic-layers/raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend deleted file mode 100644 index 2b9c4fbc..00000000 --- a/dynamic-layers/raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend +++ /dev/null @@ -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 -}