Convert CONFIG_KEYBOARD to Kconfig

This converts the following to Kconfig:
   CONFIG_KEYBOARD

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

diff --git a/README b/README
index 27e0b0719c738c3902707147a54415454a8ac7ee..05b0d3fdf7c5b273f391ef337be0eebbc40bd0cb 100644 (file)
--- a/README
+++ b/README
@@ -1063,14 +1063,6 @@ The following options need to be configured:
 - Keyboard Support:
                See Kconfig help for available keyboard drivers.
 
-               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. This option is deprecated
-               and is only used by novena. For new boards, use driver model
-               instead.
-
 - Video support:
                CONFIG_FSL_DIU_FB
                Enable the Freescale DIU video driver.  Reference boards for

diff --git a/arch/Kconfig b/arch/Kconfig
index 3e2cc84ab2c45d33f456b9e5ac12bc791219c805..fffddac04c2c45fa65222ecf80b28f82c2676951 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -194,6 +194,7 @@ config SANDBOX
        imply PHY_FIXED
        imply DM_DSA
        imply CMD_EXTENSION
+       imply KEYBOARD
 
 config SH
        bool "SuperH architecture"

diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index 7f3aee57129041dadcb1b382c111a857a549b6e5..10301c10888e0890f565cf30a22f7fabd7d00e96 100644 (file)
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -23,6 +23,7 @@ config ARCH_EXYNOS5
        imply CMD_HASH
        imply CRC32_VERIFY
        imply HASH_VERIFY
+       imply KEYBOARD
        imply USB_ETHER_ASIX
        imply USB_ETHER_RTL8152
        imply USB_ETHER_SMSC95XX

diff --git a/configs/chromebit_mickey_defconfig b/configs/chromebit_mickey_defconfig
index 80ed1f0a1450f498dc723e78837227e38ab81104..62b54d95b1416e62fcabfe0e138fad2c74a59717 100644 (file)
--- a/configs/chromebit_mickey_defconfig
+++ b/configs/chromebit_mickey_defconfig
@@ -61,6 +61,7 @@ CONFIG_I2C_CROS_EC_TUNNEL=y
 CONFIG_SYS_I2C_ROCKCHIP=y
 CONFIG_I2C_MUX=y
 CONFIG_DM_KEYBOARD=y
+CONFIG_KEYBOARD=y
 CONFIG_CROS_EC_KEYB=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_SPI=y

diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig
index 85f612093df4844373915a53d32272096a214ac6..a9f81e3c09aa2d2d673bc972234e6f73f6dca355 100644 (file)
--- a/configs/chromebook_jerry_defconfig
+++ b/configs/chromebook_jerry_defconfig
@@ -63,6 +63,7 @@ CONFIG_I2C_CROS_EC_TUNNEL=y
 CONFIG_SYS_I2C_ROCKCHIP=y
 CONFIG_I2C_MUX=y
 CONFIG_DM_KEYBOARD=y
+CONFIG_KEYBOARD=y
 CONFIG_CROS_EC_KEYB=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_SPI=y

diff --git a/configs/chromebook_minnie_defconfig b/configs/chromebook_minnie_defconfig
index 41a3fe1a3c5eb780595a4369d6b38a391111fbff..1e87b118744d938d291dc291db06b5e5045263dd 100644 (file)
--- a/configs/chromebook_minnie_defconfig
+++ b/configs/chromebook_minnie_defconfig
@@ -63,6 +63,7 @@ CONFIG_I2C_CROS_EC_TUNNEL=y
 CONFIG_SYS_I2C_ROCKCHIP=y
 CONFIG_I2C_MUX=y
 CONFIG_DM_KEYBOARD=y
+CONFIG_KEYBOARD=y
 CONFIG_CROS_EC_KEYB=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_SPI=y

diff --git a/configs/chromebook_speedy_defconfig b/configs/chromebook_speedy_defconfig
index b396d9f70551b102ad798c8e4b2abeea3bb6c85d..f1ccdc4572c2566e0b5537e4943f9677e4a6972f 100644 (file)
--- a/configs/chromebook_speedy_defconfig
+++ b/configs/chromebook_speedy_defconfig
@@ -62,6 +62,7 @@ CONFIG_I2C_CROS_EC_TUNNEL=y
 CONFIG_SYS_I2C_ROCKCHIP=y
 CONFIG_I2C_MUX=y
 CONFIG_DM_KEYBOARD=y
+CONFIG_KEYBOARD=y
 CONFIG_CROS_EC_KEYB=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_SPI=y

diff --git a/configs/novena_defconfig b/configs/novena_defconfig
index 06864db00d53a34c6ca5745227f5feb28d4df422..e40e80e203c6fd0e0de23c237639182dc81076ac 100644 (file)
--- a/configs/novena_defconfig
+++ b/configs/novena_defconfig
@@ -60,6 +60,7 @@ CONFIG_DWC_AHSATA=y
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SPL_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_MXC=y
+CONFIG_KEYBOARD=y
 CONFIG_FSL_USDHC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y

diff --git a/configs/smdk5250_defconfig b/configs/smdk5250_defconfig
index 9429114932cb332186c364bc9549c13e7e2ec353..f8350bfffc462a6fb8720b085667e86e2fb78138 100644 (file)
--- a/configs/smdk5250_defconfig
+++ b/configs/smdk5250_defconfig
@@ -43,6 +43,7 @@ CONFIG_USE_ENV_SPI_BUS=y
 CONFIG_ENV_SPI_BUS=1
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SYS_I2C_S3C24X0=y
+# CONFIG_KEYBOARD is not set
 CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_SDHCI=y

diff --git a/configs/smdk5420_defconfig b/configs/smdk5420_defconfig
index e62f432e43acedd1015ed462d28f7b7b8139c852..a9924a46c3fb76dba07cdabf51dbcaba14f096d6 100644 (file)
--- a/configs/smdk5420_defconfig
+++ b/configs/smdk5420_defconfig
@@ -38,6 +38,7 @@ CONFIG_USE_ENV_SPI_BUS=y
 CONFIG_ENV_SPI_BUS=1
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SYS_I2C_S3C24X0=y
+# CONFIG_KEYBOARD is not set
 CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_SDHCI=y

diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index a17e55e9972104e4d1d0f4637eacb1fb4067ea96..0b753f37bf49adfd8425a750b6ce861cd8c581e7 100644 (file)
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@ -38,6 +38,15 @@ config TPL_DM_KEYBOARD
          includes methods to start/stop the device, check for available
          input and update LEDs if the keyboard has them.
 
+config KEYBOARD
+       bool "Enable legacy keyboard support (deprecated)"
+       help
+         Enable 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.
+
 config CROS_EC_KEYB
        bool "Enable Chrome OS EC keyboard support"
        depends on INPUT

diff --git a/include/configs/exynos5-dt-common.h b/include/configs/exynos5-dt-common.h
index cc9ffda669ee42095bbe5ec8571b17d2141b1036..00b67787d9e6e7f9f46a3077656cf76dd3deb27a 100644 (file)
--- a/include/configs/exynos5-dt-common.h
+++ b/include/configs/exynos5-dt-common.h
@@ -30,7 +30,4 @@
 #define LCD_BPP                        LCD_COLOR16
 #endif
 
-/* Enable keyboard */
-#define CONFIG_KEYBOARD
-
 #endif

diff --git a/include/configs/novena.h b/include/configs/novena.h
index 28fb1b8d7531c6499ce1e057686be24a7d04600d..f09b868d438be00ef9c6769f9ae8afe718bec96b 100644 (file)
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -9,7 +9,6 @@
 #define __CONFIG_H
 
 /* System configurations */
-#define CONFIG_KEYBOARD
 
 #include "mx6_common.h"
 

diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index fd972b8c46d2827a20969f9ec0bbf21dc1bced7d..d0adcfd75eeafc520fd6549bdfc0de0d999f4177 100644 (file)
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -40,14 +40,6 @@
 #define CONFIG_SANDBOX_SDL
 #endif
 
-/* LCD and keyboard require SDL support */
-#ifdef CONFIG_SANDBOX_SDL
-#define LCD_BPP                        LCD_COLOR16
-#define CONFIG_LCD_BMP_RLE8
-
-#define CONFIG_KEYBOARD
-#endif
-
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_SYS_IDE_MAXBUS          1
 #define CONFIG_SYS_ATA_IDE0_OFFSET     0

diff --git a/include/configs/smdk5250.h b/include/configs/smdk5250.h
index 3af13673f2a01d39fa0aaebebbfaae8ad4b31247..d7e86f2f7644cd330bfbd837b2a1d1aa9daa0358 100644 (file)
--- a/include/configs/smdk5250.h
+++ b/include/configs/smdk5250.h
@@ -14,7 +14,6 @@
 
 #undef CONFIG_EXYNOS_FB
 #undef CONFIG_EXYNOS_DP
-#undef CONFIG_KEYBOARD
 
 #define CONFIG_BOARD_COMMON
 

diff --git a/include/configs/smdk5420.h b/include/configs/smdk5420.h
index d06dfe43a2396cac84f9b214bee43e792c7601ad..38691b63dafec7e2f44357dcd44a29a1250c0bf3 100644 (file)
--- a/include/configs/smdk5420.h
+++ b/include/configs/smdk5420.h
@@ -15,8 +15,6 @@
 #undef CONFIG_EXYNOS_FB
 #undef CONFIG_EXYNOS_DP
 
-#undef CONFIG_KEYBOARD
-
 #define CONFIG_BOARD_COMMON
 
 #define CONFIG_SMDK5420                        /* which is in a SMDK5420 */

diff --git a/include/configs/veyron.h b/include/configs/veyron.h
index 2ab6d6c6aac20592c0cc2de4a243ec74e24b976d..ce9441d71f090ab197d562fcf95aa510847af568 100644 (file)
--- a/include/configs/veyron.h
+++ b/include/configs/veyron.h
@@ -13,6 +13,4 @@
 
 #include <configs/rk3288_common.h>
 
-#define CONFIG_KEYBOARD
-
 #endif

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index a8c3a3886bf6c2e70ba0d8120386b010deef1e65..d3762165da9db4c58a6d923e94f882076560f06a 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -641,7 +641,6 @@ CONFIG_JFFS2_SUMMARY
 CONFIG_JRSTARTR_JR0
 CONFIG_JTAG_CONSOLE
 CONFIG_KEEP_SERVERADDR
-CONFIG_KEYBOARD
 CONFIG_KEY_REVOCATION
 CONFIG_KIRKWOOD_EGIGA_INIT
 CONFIG_KIRKWOOD_GPIO