From 681591b5b8879a7607cff8ca5dfb0adf7f69051b Mon Sep 17 00:00:00 2001 From: Christopher Clark Date: Fri, 7 Aug 2020 00:05:00 -0700 Subject: xen, raspberrypi: bugfix early boot messages: use earlycon=xenboot Replaces the prior use of earlyprintk which is an x86-specific option. Signed-off-by: Christopher Clark Signed-off-by: Bruce Ashfield --- .../raspberrypi/recipes-bsp/rpi-u-boot-scr/files/boot.cmd.xen.in | 2 +- .../raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'dynamic-layers') diff --git a/dynamic-layers/raspberrypi/recipes-bsp/rpi-u-boot-scr/files/boot.cmd.xen.in b/dynamic-layers/raspberrypi/recipes-bsp/rpi-u-boot-scr/files/boot.cmd.xen.in index 6c38d7d7..84d533a6 100644 --- a/dynamic-layers/raspberrypi/recipes-bsp/rpi-u-boot-scr/files/boot.cmd.xen.in +++ b/dynamic-layers/raspberrypi/recipes-bsp/rpi-u-boot-scr/files/boot.cmd.xen.in @@ -14,7 +14,7 @@ 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" +setenv dom0_bootargs "console=hvc0 earlycon=xenboot 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 diff --git a/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend b/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend index 25979e2c..bead4aac 100644 --- a/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend +++ b/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend @@ -1,5 +1,5 @@ # For a Xen-enabled distro, override the contents of cmdline.txt DEFAULT_CMDLINE := "${CMDLINE}" -XEN_LINUX_CMDLINE ?= "console=hvc0 clk_ignore_unused earlyprintk=xen debug root=/dev/mmcblk0p2 rootwait" +XEN_LINUX_CMDLINE ?= "console=hvc0 clk_ignore_unused earlycon=xenboot debug root=/dev/mmcblk0p2 rootwait" CMDLINE = "${@bb.utils.contains('DISTRO_FEATURES', 'xen', '${XEN_LINUX_CMDLINE}', '${DEFAULT_CMDLINE}', d)}" -- cgit v1.2.3-54-g00ecf