diff options
| author | Ross Burton <ross@burtonini.com> | 2022-04-19 16:45:41 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-04-20 13:14:00 +0100 |
| commit | eccb34f80cbb67ff03547bf66740cb1c65373fda (patch) | |
| tree | 8338fd335f3913488cd410926ea422ddfd14b3d6 /meta/conf/machine | |
| parent | 42ed634570c6633e1bd2dd28c377a2c1fd1ba961 (diff) | |
| download | poky-eccb34f80cbb67ff03547bf66740cb1c65373fda.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 ]
(From OE-Core rev: c01f47003f34b9ad2fe3d17e1ead84c27ee1e57d)
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.inc | 11 |
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 @@ | |||
| 1 | # For runqemu | 1 | # For runqemu |
| 2 | IMAGE_CLASSES += "qemuboot" | 2 | IMAGE_CLASSES += "qemuboot" |
| 3 | QB_SMP = "-smp 4" | 3 | QB_SMP = "-smp 4" |
| 4 | QB_CPU:x86 = "-cpu IvyBridge -machine q35" | 4 | QB_CPU:x86 = "-cpu IvyBridge -machine q35,i8042=off" |
| 5 | QB_CPU_KVM:x86 = "-cpu IvyBridge -machine q35" | 5 | QB_CPU_KVM:x86 = "-cpu IvyBridge -machine q35,i8042=off" |
| 6 | 6 | ||
| 7 | QB_CPU:x86-64 = "-cpu IvyBridge -machine q35" | 7 | QB_CPU:x86-64 = "-cpu IvyBridge -machine q35,i8042=off" |
| 8 | QB_CPU_KVM:x86-64 = "-cpu IvyBridge -machine q35" | 8 | QB_CPU_KVM:x86-64 = "-cpu IvyBridge -machine q35,i8042=off" |
| 9 | 9 | ||
| 10 | QB_AUDIO_DRV = "alsa" | 10 | QB_AUDIO_DRV = "alsa" |
| 11 | QB_AUDIO_OPT = "-device AC97" | 11 | QB_AUDIO_OPT = "-device AC97" |
| 12 | QB_KERNEL_CMDLINE_APPEND = "oprofile.timer=1 tsc=reliable no_timer_check rcupdate.rcu_expedited=1" | 12 | QB_KERNEL_CMDLINE_APPEND = "oprofile.timer=1 tsc=reliable no_timer_check rcupdate.rcu_expedited=1" |
| 13 | QB_OPT_APPEND = "-usb -device usb-tablet" | 13 | QB_OPT_APPEND = "-usb -device usb-tablet -usb -device usb-kbd" |
| 14 | |||