From b6ff6ce60cd294af3678606eb51fdc2fe6b752bb Mon Sep 17 00:00:00 2001 From: Bin Meng Date: Thu, 12 Nov 2015 05:33:06 -0800 Subject: [PATCH] x86: qemu: Convert to use driver model keyboard Convert to use driver model keyboard on QEMU. Signed-off-by: Bin Meng Acked-by: Simon Glass --- arch/x86/dts/qemu-x86_i440fx.dts | 1 + arch/x86/dts/qemu-x86_q35.dts | 1 + include/configs/qemu-x86.h | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/x86/dts/qemu-x86_i440fx.dts b/arch/x86/dts/qemu-x86_i440fx.dts index fc74cd0f01..8da7e52395 100644 --- a/arch/x86/dts/qemu-x86_i440fx.dts +++ b/arch/x86/dts/qemu-x86_i440fx.dts @@ -10,6 +10,7 @@ /include/ "skeleton.dtsi" /include/ "serial.dtsi" +/include/ "keyboard.dtsi" /include/ "rtc.dtsi" / { diff --git a/arch/x86/dts/qemu-x86_q35.dts b/arch/x86/dts/qemu-x86_q35.dts index 7f16971783..df30c89fab 100644 --- a/arch/x86/dts/qemu-x86_q35.dts +++ b/arch/x86/dts/qemu-x86_q35.dts @@ -20,6 +20,7 @@ /include/ "skeleton.dtsi" /include/ "serial.dtsi" +/include/ "keyboard.dtsi" /include/ "rtc.dtsi" / { diff --git a/include/configs/qemu-x86.h b/include/configs/qemu-x86.h index e3e1237fa8..e3445dd24e 100644 --- a/include/configs/qemu-x86.h +++ b/include/configs/qemu-x86.h @@ -19,7 +19,7 @@ #define CONFIG_PCI_PNP -#define CONFIG_STD_DEVICES_SETTINGS "stdin=serial,vga\0" \ +#define CONFIG_STD_DEVICES_SETTINGS "stdin=serial,i8042-kbd\0" \ "stdout=serial,vga\0" \ "stderr=serial,vga\0" -- 2.25.1