summaryrefslogtreecommitdiffstats
path: root/meta/conf/machine
diff options
context:
space:
mode:
authorRoss Burton <ross@burtonini.com>2022-04-19 16:45:41 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-04-20 10:30:50 +0100
commitc01f47003f34b9ad2fe3d17e1ead84c27ee1e57d (patch)
treeb23ef8b27e32cf390c08328afe94fe5c433bdfdc /meta/conf/machine
parentd73e4fcfc9ca4aab25f7751ba17974a839d6340f (diff)
downloadopenembedded-core-c01f47003f34b9ad2fe3d17e1ead84c27ee1e57d.tar.gz
qemux86-64: disable legacy i8042 (AT keyboard, PS/2 mouse)
These devices are historical, modern Linux will just use the USB devices, and occasionally the init of these devices fails: atkbd serio0: Failed to deactivate keyboard on isa0060/serio0 psmouse serio1: Failed to reset mouse on isa0060/serio1: -5 Explicitly add a USB keyboard to go with the USB tablet, and disable the i8042 entirely. [ YOCTO #14718 ] [ YOCTO #14743 ] Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/machine')
-rw-r--r--meta/conf/machine/include/x86/qemuboot-x86.inc11
1 files changed, 5 insertions, 6 deletions
diff --git a/meta/conf/machine/include/x86/qemuboot-x86.inc b/meta/conf/machine/include/x86/qemuboot-x86.inc
index b7b6428e44..3953679366 100644
--- a/meta/conf/machine/include/x86/qemuboot-x86.inc
+++ b/meta/conf/machine/include/x86/qemuboot-x86.inc
@@ -1,14 +1,13 @@
# For runqemu
IMAGE_CLASSES += "qemuboot"
QB_SMP = "-smp 4"
-QB_CPU:x86 = "-cpu IvyBridge -machine q35"
-QB_CPU_KVM:x86 = "-cpu IvyBridge -machine q35"
+QB_CPU:x86 = "-cpu IvyBridge -machine q35,i8042=off"
+QB_CPU_KVM:x86 = "-cpu IvyBridge -machine q35,i8042=off"
-QB_CPU:x86-64 = "-cpu IvyBridge -machine q35"
-QB_CPU_KVM:x86-64 = "-cpu IvyBridge -machine q35"
+QB_CPU:x86-64 = "-cpu IvyBridge -machine q35,i8042=off"
+QB_CPU_KVM:x86-64 = "-cpu IvyBridge -machine q35,i8042=off"
QB_AUDIO_DRV = "alsa"
QB_AUDIO_OPT = "-device AC97"
QB_KERNEL_CMDLINE_APPEND = "oprofile.timer=1 tsc=reliable no_timer_check rcupdate.rcu_expedited=1"
-QB_OPT_APPEND = "-usb -device usb-tablet"
-
+QB_OPT_APPEND = "-usb -device usb-tablet -usb -device usb-kbd"