diff options
author | Trevor Gamblin <trevor.gamblin@windriver.com> | 2020-05-28 16:06:45 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-05-30 12:32:48 +0100 |
commit | 1f3753bb0fd06063bd2072c71ecc527145366ced (patch) | |
tree | ab849609dbe1a7b769cd5db28943aaf6dc40dcfa | |
parent | 3c0617f01ea6d71ef2ad10b82da5594d0985a3cc (diff) | |
download | poky-1f3753bb0fd06063bd2072c71ecc527145366ced.tar.gz |
qemuarm: check serial consoles vs /proc/consoles
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.
(From OE-Core rev: 982b7f98b8423236cc986346379b1bde3694f131)
Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/conf/machine/qemuarm.conf | 1 | ||||
-rw-r--r-- | meta/conf/machine/qemuarm64.conf | 1 |
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 | |||
8 | KERNEL_IMAGETYPE = "zImage" | 8 | KERNEL_IMAGETYPE = "zImage" |
9 | 9 | ||
10 | SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0" | 10 | SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0" |
11 | SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" | ||
11 | 12 | ||
12 | # For runqemu | 13 | # For runqemu |
13 | QB_SYSTEM_NAME = "qemu-system-arm" | 14 | 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 | |||
8 | KERNEL_IMAGETYPE = "Image" | 8 | KERNEL_IMAGETYPE = "Image" |
9 | 9 | ||
10 | SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0" | 10 | SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0" |
11 | SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" | ||
11 | 12 | ||
12 | # For runqemu | 13 | # For runqemu |
13 | QB_SYSTEM_NAME = "qemu-system-aarch64" | 14 | QB_SYSTEM_NAME = "qemu-system-aarch64" |