xen, raspberry pi: add dynamic-layer for Xen configuration for Rpi4

A Xen-specific u-boot script is needed for launching Xen, and the GIC
(interrupt controller) needs to be enabled.

Since this is both Xen-specific and Raspberry Pi-specific, use a
dynamic layer to conditionally enable the recipes when both
meta-virtualization and meta-raspberrypi are in use together.

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-06-29 18:54:49 -07:00 committed by Bruce Ashfield
parent 4c0e161157
commit 90a01fcbd9
4 changed files with 87 additions and 0 deletions

View File

@ -11,6 +11,21 @@ BBFILE_PRIORITY_virtualization-layer = "8"
# Custom licenses used by some packages in this layer
LICENSE_PATH += "${LAYERDIR}/files/custom-licenses"
# The dynamic-layers directory hosts extensions and layer-specific
# modifications.
#
# The .bbappend and .bb files are included if the respective layer
# collection is available.
BBFILES += "${@' '.join('${LAYERDIR}/dynamic-layers/%s/recipes*/*/*.bbappend' % layer \
for layer in BBFILE_COLLECTIONS.split())}"
BBFILES += "${@' '.join('${LAYERDIR}/dynamic-layers/%s/recipes*/*/*.bb' % layer \
for layer in BBFILE_COLLECTIONS.split())}"
BBFILES_DYNAMIC += " \
raspberrypi:${LAYERDIR}/dynamic-layers/raspberrypi/*/*/*.bb \
raspberrypi:${LAYERDIR}/dynamic-layers/rasbperrypi/*/*/*.bbappend \
"
# This should only be incremented on significant changes that will
# cause compatibility issues with other layers
LAYERVERSION_virtualization-layer = "1"

View File

@ -0,0 +1,6 @@
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
}

View File

@ -0,0 +1,49 @@
# Set the fdt address to what came from the GPU, so we can edit it
fdt addr ${fdt_addr}
# Pull the bootargs that the GPU has edited
fdt get value bootargs /chosen bootargs
# Set module load addresses
setenv xen_loadaddr "0x00200000"
setenv kernel_loadaddr "0x00400000"
# Add some space to the fdt so we can edit it
fdt resize 0x1000
echo Add boot arguments for Xen
fdt set /chosen xen,xen-bootargs "console=dtuart dtuart=/soc/serial@7e215040 dom0_mem='@@RPI_DOM0_MEM@@' @@RPI_DEBUG_XEN_ARGS@@"
echo Add boot arguments for dom0
setenv dom0_bootargs "console=hvc0 earlyprintk=xen debug root=/dev/mmcblk0p2 rootwait"
fdt set /chosen xen,dom0-bootargs \"${dom0_bootargs}\"
echo Add a dom0 node to chosen to put Linux boot information in
fdt mknode /chosen dom0
echo Set this for the Linux boot command
fdt set /chosen/dom0 compatible "xen,linux-zimage", "xen,multiboot-module"
# Tell Xen where PCI is
fdt set /scb/pcie@7d500000 device_type "pci"
echo Delay to allow the MMC card to be ready
sleep 1
echo Load Xen into memory
fatload mmc 0:1 ${xen_loadaddr} xen
echo Load Linux kernel into memory
fatload mmc 0:1 ${kernel_loadaddr} Image
setenv kernel_size 0x$filesize
echo Set the address and size for the Linux kernel so Xen can pick it up
fdt set /chosen/dom0 reg <${kernel_loadaddr} ${kernel_size}>
# Define the size and address cells
fdt set /chosen '#size-cells' <1>
fdt set /chosen '#address-cells' <1>
# Display the chosen fdt section - can be important for debugging
fdt print /chosen
echo Boot Xen
booti ${xen_loadaddr} - ${fdt_addr}

View File

@ -0,0 +1,17 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
RPI_DOM0_MEM ??= "256M"
RPI_DEBUG_XEN_ARGS ??= "sync_console bootscrub=0"
SRC_URI += "file://boot.cmd.xen.in"
# If the distro is Xen enabled, override the default boot.cmd.in with the
# alternative boot.cmd.xen.in from this layer, with variables subsitution here
do_compile_append() {
if [ "${@bb.utils.contains('DISTRO_FEATURES', 'xen', 'yes', 'no', d)}" = "yes" ]; then
sed -e 's/@@RPI_DOM0_MEM@@/${RPI_DOM0_MEM}/' \
-e 's/@@RPI_DEBUG_XEN_ARGS@@/${RPI_DEBUG_XEN_ARGS}/' \
"${WORKDIR}/boot.cmd.xen.in" > "${WORKDIR}/boot.cmd"
mkimage -A arm -T script -C none -n "Boot script" -d "${WORKDIR}/boot.cmd" boot.scr
fi
}