summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2016-09-08 18:47:35 +0900
committerTom Rini <trini@konsulko.com>2016-10-01 20:04:33 -0400
commit558e12571e3cc949837ab0c232a1bb528a8f95da (patch)
treef0ce8f10e05a96540168cca453446a33dbe60907
parent45b047e557bdcf68dc08e61cf207dd35b9ba8bbc (diff)
downloadu-boot-558e12571e3cc949837ab0c232a1bb528a8f95da.tar.gz
u-boot-558e12571e3cc949837ab0c232a1bb528a8f95da.tar.bz2
u-boot-558e12571e3cc949837ab0c232a1bb528a8f95da.zip
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>
-rw-r--r--arch/Kconfig2
-rw-r--r--arch/sandbox/Kconfig3
-rw-r--r--arch/x86/Kconfig3
3 files changed, 2 insertions, 6 deletions
diff --git a/arch/Kconfig b/arch/Kconfig
index d718a68171..ffc7b45379 100644
--- 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 d4c1ee0662..c931c0b437 100644
--- 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 5193ee7159..9207549401 100644
--- 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