summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorTrevor Gamblin <trevor.gamblin@windriver.com>2020-05-28 16:06:45 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-05-30 12:31:49 +0100
commit982b7f98b8423236cc986346379b1bde3694f131 (patch)
tree64d38ff9519cd331179b1cc93fbbf2b7a346f152 /meta
parent567f4572518d15ac2b01b91ce55611146471c07a (diff)
downloadopenembedded-core-master.tar.gz
openembedded-core-master.tar.bz2
openembedded-core-master.zip
qemuarm: check serial consoles vs /proc/consolesHEADmaster
Note that this patch affects qemuarm AND qemuarm64. When booting a VM and during operation, the following message periodically appears: INIT: Id "hvc0" respawning too fast: disabled for 5 minutes This is because hvc0 is specified in SERIAL_CONSOLES in qemuarm.conf and qemuarm64.conf, but it is not in /proc/consoles and SERIAL_CONSOLES_CHECK is not specified, leaving getty to attempt to enable hvc0. Add SERIAL_CONSOLES_CHECK to both conf files so that hvc0 isn't enabled if it hasn't been set there or in local.conf. Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/machine/qemuarm.conf1
-rw-r--r--meta/conf/machine/qemuarm64.conf1
2 files changed, 2 insertions, 0 deletions
diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf
index 367fcef019..4e605d3a92 100644
--- a/meta/conf/machine/qemuarm.conf
+++ b/meta/conf/machine/qemuarm.conf
@@ -8,6 +8,7 @@ require conf/machine/include/qemu.inc
KERNEL_IMAGETYPE = "zImage"
SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
# For runqemu
QB_SYSTEM_NAME = "qemu-system-arm"
diff --git a/meta/conf/machine/qemuarm64.conf b/meta/conf/machine/qemuarm64.conf
index 7965fac71e..e8aac38475 100644
--- a/meta/conf/machine/qemuarm64.conf
+++ b/meta/conf/machine/qemuarm64.conf
@@ -8,6 +8,7 @@ require conf/machine/include/qemu.inc
KERNEL_IMAGETYPE = "Image"
SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0"
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
# For runqemu
QB_SYSTEM_NAME = "qemu-system-aarch64"