diff mbox

[U-Boot,25/28] Drop CONFIG_ISA_KEYBOARD

Message ID 1441773171-4575-26-git-send-email-sjg@chromium.org
State Superseded
Delegated to: Simon Glass
Headers show

Commit Message

Simon Glass Sept. 9, 2015, 4:32 a.m. UTC
This option is mentioned but does not do anything. Drop it.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 README                   | 11 ++++++-----
 board/mpl/pip405/README  |  4 ----
 include/configs/MIP405.h |  5 -----
 include/configs/PIP405.h |  5 -----
 4 files changed, 6 insertions(+), 19 deletions(-)

Comments

Bin Meng Sept. 15, 2015, 6:12 a.m. UTC | #1
On Wed, Sep 9, 2015 at 12:32 PM, Simon Glass <sjg@chromium.org> wrote:
> This option is mentioned but does not do anything. Drop it.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
>  README                   | 11 ++++++-----
>  board/mpl/pip405/README  |  4 ----
>  include/configs/MIP405.h |  5 -----
>  include/configs/PIP405.h |  5 -----
>  4 files changed, 6 insertions(+), 19 deletions(-)
>
> diff --git a/README b/README
> index 54c1d08..dd857c4 100644
> --- a/README
> +++ b/README
> @@ -1785,17 +1785,18 @@ CBFS (Coreboot Filesystem) support
>                 a default value of 65536 will be defined.
>
>  - Keyboard Support:
> -               CONFIG_ISA_KEYBOARD
> -
> -               Define this to enable standard (PC-Style) keyboard
> -               support
> -
>                 CONFIG_I8042_KBD
>                 Standard PC keyboard driver with US (is default) and
>                 GERMAN key layout (switch via environment 'keymap=de') support.
>                 Export function i8042_kbd_init, i8042_tstc and i8042_getc
>                 for cfb_console. Supports cursor blinking.
>
> +               CONFIG_CROS_EC_KEYB
> +               Enables a Chrome OS keyboard using the CROS_EC interface.
> +               This uses CROS_EC to communicate with a second microcontroller
> +               which provides key scans on request.
> +               See Kconfig help for available keyboard drivers.
> +
>  - Video support:
>                 CONFIG_VIDEO
>
> diff --git a/board/mpl/pip405/README b/board/mpl/pip405/README
> index 012db1c..1b73dbe 100644
> --- a/board/mpl/pip405/README
> +++ b/board/mpl/pip405/README
> @@ -114,10 +114,6 @@ RTC
>  ----
>  CONFIG_RTC_MC146818            MC146818 RTC support
>
> -Keyboard:
> ----------
> -CONFIG_ISA_KEYBOARD            Standard (PC-Style) Keyboard support
> -
>  Video:
>  ------
>  CONFIG_VIDEO_CT69000           Enable Chips & Technologies 69000 Video chip
> diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h
> index cb21b73..5bbc0de 100644
> --- a/include/configs/MIP405.h
> +++ b/include/configs/MIP405.h
> @@ -364,11 +364,6 @@
>  #define CONFIG_ISO_PARTITION /* Experimental */
>
>  /************************************************************
> - * Keyboard support
> - ************************************************************/
> -#undef CONFIG_ISA_KEYBOARD
> -
> -/************************************************************
>   * Video support
>   ************************************************************/
>  #define CONFIG_VIDEO                   /*To enable video controller support */
> diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h
> index c9d08e6..265fa12 100644
> --- a/include/configs/PIP405.h
> +++ b/include/configs/PIP405.h
> @@ -321,11 +321,6 @@
>  #define CONFIG_ISO_PARTITION /* Experimental */
>
>  /************************************************************
> - * Keyboard support
> - ************************************************************/
> -#define CONFIG_ISA_KEYBOARD
> -
> -/************************************************************
>   * Video support
>   ************************************************************/
>  #define CONFIG_VIDEO                   /*To enable video controller support */
> --

Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
diff mbox

Patch

diff --git a/README b/README
index 54c1d08..dd857c4 100644
--- a/README
+++ b/README
@@ -1785,17 +1785,18 @@  CBFS (Coreboot Filesystem) support
 		a default value of 65536 will be defined.
 
 - Keyboard Support:
-		CONFIG_ISA_KEYBOARD
-
-		Define this to enable standard (PC-Style) keyboard
-		support
-
 		CONFIG_I8042_KBD
 		Standard PC keyboard driver with US (is default) and
 		GERMAN key layout (switch via environment 'keymap=de') support.
 		Export function i8042_kbd_init, i8042_tstc and i8042_getc
 		for cfb_console. Supports cursor blinking.
 
+		CONFIG_CROS_EC_KEYB
+		Enables a Chrome OS keyboard using the CROS_EC interface.
+		This uses CROS_EC to communicate with a second microcontroller
+		which provides key scans on request.
+		See Kconfig help for available keyboard drivers.
+
 - Video support:
 		CONFIG_VIDEO
 
diff --git a/board/mpl/pip405/README b/board/mpl/pip405/README
index 012db1c..1b73dbe 100644
--- a/board/mpl/pip405/README
+++ b/board/mpl/pip405/README
@@ -114,10 +114,6 @@  RTC
 ----
 CONFIG_RTC_MC146818		MC146818 RTC support
 
-Keyboard:
----------
-CONFIG_ISA_KEYBOARD		Standard (PC-Style) Keyboard support
-
 Video:
 ------
 CONFIG_VIDEO_CT69000		Enable Chips & Technologies 69000 Video chip
diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h
index cb21b73..5bbc0de 100644
--- a/include/configs/MIP405.h
+++ b/include/configs/MIP405.h
@@ -364,11 +364,6 @@ 
 #define CONFIG_ISO_PARTITION /* Experimental */
 
 /************************************************************
- * Keyboard support
- ************************************************************/
-#undef CONFIG_ISA_KEYBOARD
-
-/************************************************************
  * Video support
  ************************************************************/
 #define CONFIG_VIDEO			/*To enable video controller support */
diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h
index c9d08e6..265fa12 100644
--- a/include/configs/PIP405.h
+++ b/include/configs/PIP405.h
@@ -321,11 +321,6 @@ 
 #define CONFIG_ISO_PARTITION /* Experimental */
 
 /************************************************************
- * Keyboard support
- ************************************************************/
-#define CONFIG_ISA_KEYBOARD
-
-/************************************************************
  * Video support
  ************************************************************/
 #define CONFIG_VIDEO			/*To enable video controller support */