sandbox, x86: select DM_KEYBOARD instead of default y entry

Once we migrate to DM-based drivers, we cannot go back to legacy
ones, i.e. config options like DM_* are not user-configurable.

Make SANDBOX and X86 select DM_KEYBOARD like other platforms do.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/Kconfig b/arch/Kconfig
index d718a68171286f0216c463adf834a03333ec39b5..ffc7b45379401da5e9f339fd82ad14f85d392c36 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -62,6 +62,7 @@ config SANDBOX
        bool "Sandbox"
        select SUPPORT_OF_CONTROL
        select DM
+       select DM_KEYBOARD
        select DM_SPI_FLASH
        select DM_SERIAL
        select DM_I2C
@@ -83,6 +84,7 @@ config X86
        select HAVE_PRIVATE_LIBGCC
        select SUPPORT_OF_CONTROL
        select DM
+       select DM_KEYBOARD
        select DM_SERIAL
        select DM_GPIO
        select DM_SPI

diff --git a/arch/sandbox/Kconfig b/arch/sandbox/Kconfig
index d4c1ee0662c57f74e3b7acb35418a2789d2b90ac..c931c0b43755c12fcf3e07256ed15f131244caae 100644 (file)
--- a/arch/sandbox/Kconfig
+++ b/arch/sandbox/Kconfig
@@ -25,7 +25,4 @@ config PCI
          used on some devices to allow the CPU to communicate with its
          peripherals.
 
-config DM_KEYBOARD
-       default y
-
 endmenu

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 5193ee7159171dffc691ac00733be67e170bfcff..9207549401b26daef7ddca2db960dbdcde8ab45e 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -549,9 +549,6 @@ config I8254_TIMER
 config I8042_KEYB
        default y
 
-config DM_KEYBOARD
-       default y
-
 config SEABIOS
        bool "Support booting SeaBIOS"
        help