mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-28 15:41:40 +00:00
video: input: Clean up after i8042 conversion
Now that i8042 uses driver model, adjust other mentions of it and remove old code that is no-longer used. Update the README and unify the keyboard text into one place. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
parent
011d89d606
commit
39f615ed88
2 changed files with 16 additions and 33 deletions
29
README
29
README
|
@ -867,11 +867,11 @@ The following options need to be configured:
|
||||||
(0-5, cf. cfb_console.c)
|
(0-5, cf. cfb_console.c)
|
||||||
VIDEO_FB_ADRS framebuffer address
|
VIDEO_FB_ADRS framebuffer address
|
||||||
VIDEO_KBD_INIT_FCT keyboard int fct
|
VIDEO_KBD_INIT_FCT keyboard int fct
|
||||||
(i.e. i8042_kbd_init())
|
(i.e. rx51_kp_init())
|
||||||
VIDEO_TSTC_FCT test char fct
|
VIDEO_TSTC_FCT test char fct
|
||||||
(i.e. i8042_tstc)
|
(i.e. rx51_kp_tstc)
|
||||||
VIDEO_GETC_FCT get char fct
|
VIDEO_GETC_FCT get char fct
|
||||||
(i.e. i8042_getc)
|
(i.e. rx51_kp_getc)
|
||||||
CONFIG_VIDEO_LOGO display Linux logo in
|
CONFIG_VIDEO_LOGO display Linux logo in
|
||||||
upper left corner
|
upper left corner
|
||||||
CONFIG_VIDEO_BMP_LOGO use bmp_logo.h instead of
|
CONFIG_VIDEO_BMP_LOGO use bmp_logo.h instead of
|
||||||
|
@ -1767,11 +1767,15 @@ CBFS (Coreboot Filesystem) support
|
||||||
a default value of 65536 will be defined.
|
a default value of 65536 will be defined.
|
||||||
|
|
||||||
- Keyboard Support:
|
- Keyboard Support:
|
||||||
CONFIG_I8042_KBD
|
See Kconfig help for available keyboard drivers.
|
||||||
Standard PC keyboard driver with US (is default) and
|
|
||||||
GERMAN key layout (switch via environment 'keymap=de') support.
|
CONFIG_KEYBOARD
|
||||||
Export function i8042_kbd_init, i8042_tstc and i8042_getc
|
|
||||||
for cfb_console. Supports cursor blinking.
|
Define this to enable a custom keyboard support.
|
||||||
|
This simply calls drv_keyboard_init() which must be
|
||||||
|
defined in your board-specific files. This option is deprecated
|
||||||
|
and is only used by novena. For new boards, use driver model
|
||||||
|
instead.
|
||||||
|
|
||||||
- Video support:
|
- Video support:
|
||||||
CONFIG_VIDEO
|
CONFIG_VIDEO
|
||||||
|
@ -1832,15 +1836,6 @@ CBFS (Coreboot Filesystem) support
|
||||||
boot. See the documentation file README.video for a
|
boot. See the documentation file README.video for a
|
||||||
description of this variable.
|
description of this variable.
|
||||||
|
|
||||||
|
|
||||||
- Keyboard Support:
|
|
||||||
CONFIG_KEYBOARD
|
|
||||||
|
|
||||||
Define this to enable a custom keyboard support.
|
|
||||||
This simply calls drv_keyboard_init() which must be
|
|
||||||
defined in your board-specific files.
|
|
||||||
The only board using this so far is RBC823.
|
|
||||||
|
|
||||||
- LCD Support: CONFIG_LCD
|
- LCD Support: CONFIG_LCD
|
||||||
|
|
||||||
Define this to enable LCD support (for output to LCD
|
Define this to enable LCD support (for output to LCD
|
||||||
|
|
|
@ -15,8 +15,10 @@
|
||||||
* logo can be placed in the upper left corner and additional board
|
* logo can be placed in the upper left corner and additional board
|
||||||
* information strings (that normally goes to serial port) can be drawn.
|
* information strings (that normally goes to serial port) can be drawn.
|
||||||
*
|
*
|
||||||
* The console driver can use the standard PC keyboard interface (i8042)
|
* The console driver can use a keyboard interface for character input
|
||||||
* for character input. Character output goes to a memory mapped video
|
* but this is deprecated. Only rk51 uses it.
|
||||||
|
*
|
||||||
|
* Character output goes to a memory-mapped video
|
||||||
* framebuffer with little or big-endian organisation.
|
* framebuffer with little or big-endian organisation.
|
||||||
* With environment setting 'console=serial' the console i/o can be
|
* With environment setting 'console=serial' the console i/o can be
|
||||||
* forced to serial port.
|
* forced to serial port.
|
||||||
|
@ -38,7 +40,6 @@
|
||||||
* VIDEO_DATA_FORMAT - graphical data format GDF
|
* VIDEO_DATA_FORMAT - graphical data format GDF
|
||||||
* VIDEO_FB_ADRS - start of video memory
|
* VIDEO_FB_ADRS - start of video memory
|
||||||
*
|
*
|
||||||
* CONFIG_I8042_KBD - AT Keyboard driver for i8042
|
|
||||||
* VIDEO_KBD_INIT_FCT - init function for keyboard
|
* VIDEO_KBD_INIT_FCT - init function for keyboard
|
||||||
* VIDEO_TSTC_FCT - keyboard_tstc function
|
* VIDEO_TSTC_FCT - keyboard_tstc function
|
||||||
* VIDEO_GETC_FCT - keyboard_getc function
|
* VIDEO_GETC_FCT - keyboard_getc function
|
||||||
|
@ -157,19 +158,6 @@
|
||||||
#define VIDEO_DATA_FORMAT (pGD->gdfIndex)
|
#define VIDEO_DATA_FORMAT (pGD->gdfIndex)
|
||||||
#define VIDEO_FB_ADRS (pGD->frameAdrs)
|
#define VIDEO_FB_ADRS (pGD->frameAdrs)
|
||||||
|
|
||||||
/*
|
|
||||||
* Console device defines with i8042 keyboard controller
|
|
||||||
* Any other keyboard controller must change this section
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifdef CONFIG_I8042_KBD
|
|
||||||
#include <i8042.h>
|
|
||||||
|
|
||||||
#define VIDEO_KBD_INIT_FCT i8042_kbd_init()
|
|
||||||
#define VIDEO_TSTC_FCT i8042_tstc
|
|
||||||
#define VIDEO_GETC_FCT i8042_getc
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Console device
|
* Console device
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in a new issue