diff options
| author | Simon Glass <sjg@chromium.org> | 2015-11-11 10:05:43 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2015-11-19 20:13:41 -0700 |
| commit | 6b44ae6b06967cefd6dbc1993827593341fd62f7 (patch) | |
| tree | cf450b7527041cbdfd0891b62537236dc394fad2 /include | |
| parent | b0abfeff982a022d8198ef526b96d57037fe0c14 (diff) | |
| download | blackbird-obmc-uboot-6b44ae6b06967cefd6dbc1993827593341fd62f7.tar.gz blackbird-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')
| -rw-r--r-- | include/configs/bayleybay.h | 3 | ||||
| -rw-r--r-- | include/configs/chromebox_panther.h | 2 | ||||
| -rw-r--r-- | include/configs/minnowmax.h | 1 | ||||
| -rw-r--r-- | include/configs/x86-chromebook.h | 2 | ||||
| -rw-r--r-- | include/configs/x86-common.h | 2 |
5 files changed, 2 insertions, 8 deletions
diff --git a/include/configs/bayleybay.h b/include/configs/bayleybay.h index b102c689e2..92326e1d0a 100644 --- a/include/configs/bayleybay.h +++ b/include/configs/bayleybay.h @@ -32,9 +32,6 @@ #define CONFIG_MMC_SDMA #define CONFIG_CMD_MMC -/* BayTrail IGD support */ -#define CONFIG_VGA_AS_SINGLE_DEVICE - /* Environment configuration */ #define CONFIG_ENV_SECT_SIZE 0x1000 #define CONFIG_ENV_OFFSET 0x006ff000 diff --git a/include/configs/chromebox_panther.h b/include/configs/chromebox_panther.h index dc732b810f..00fe26da29 100644 --- a/include/configs/chromebox_panther.h +++ b/include/configs/chromebox_panther.h @@ -14,6 +14,4 @@ /* Avoid a warning in the Realtek Ethernet driver */ #define CONFIG_SYS_CACHELINE_SIZE 16 -#define CONFIG_VGA_AS_SINGLE_DEVICE - #endif /* __CONFIG_H */ diff --git a/include/configs/minnowmax.h b/include/configs/minnowmax.h index a20552e74e..95d356a0d4 100644 --- a/include/configs/minnowmax.h +++ b/include/configs/minnowmax.h @@ -42,7 +42,6 @@ #define VIDEO_IO_OFFSET 0 #define CONFIG_X86EMU_RAW_IO -#define CONFIG_VGA_AS_SINGLE_DEVICE #define CONFIG_FIT_SIGNATURE #define CONFIG_RSA diff --git a/include/configs/x86-chromebook.h b/include/configs/x86-chromebook.h index b0aa875f5e..9fb1a7a259 100644 --- a/include/configs/x86-chromebook.h +++ b/include/configs/x86-chromebook.h @@ -50,7 +50,7 @@ #define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_OFFSET 0x003f8000 -#define CONFIG_STD_DEVICES_SETTINGS "stdin=usbkbd,vga,serial\0" \ +#define CONFIG_STD_DEVICES_SETTINGS "stdin=usbkbd,i8042-kbd,serial\0" \ "stdout=vga,serial\0" \ "stderr=vga,serial\0" 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 |
