summaryrefslogtreecommitdiffstats
path: root/include/configs/x86-common.h
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2015-11-11 10:05:43 -0700
committerSimon Glass <sjg@chromium.org>2015-11-19 20:13:41 -0700
commit6b44ae6b06967cefd6dbc1993827593341fd62f7 (patch)
treecf450b7527041cbdfd0891b62537236dc394fad2 /include/configs/x86-common.h
parentb0abfeff982a022d8198ef526b96d57037fe0c14 (diff)
downloadtalos-obmc-uboot-6b44ae6b06967cefd6dbc1993827593341fd62f7.tar.gz
talos-obmc-uboot-6b44ae6b06967cefd6dbc1993827593341fd62f7.zip
x86: Add an i8042 device for boards that have it
Some boards have an i8042 device. Enable the driver for all x86 boards, and add a device tree node for those which may have this keyboard. Also adjust the configuration so that i8042 is always separate from the VGA, and rename the stdin driver accordingly. With this commit the keyboard will not work, but it is fixed in the next commit. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Diffstat (limited to 'include/configs/x86-common.h')
-rw-r--r--include/configs/x86-common.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index 33263ab60c..3a18f69431 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -145,7 +145,7 @@
#define CONFIG_VIDEO
#define CONFIG_VIDEO_SW_CURSOR
#define VIDEO_FB_16BPP_WORD_SWAP
-#define CONFIG_I8042_KBD
+#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_CFB_CONSOLE
#define CONFIG_CONSOLE_SCROLL_LINES 5
OpenPOWER on IntegriCloud