From c01f47003f34b9ad2fe3d17e1ead84c27ee1e57d Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 19 Apr 2022 16:45:41 +0100 Subject: 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 Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie --- meta/conf/machine/include/x86/qemuboot-x86.inc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'meta/conf') 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" -- cgit 1.2.3-korg