summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2015-08-04 17:04:13 +0200
committerMarek Vasut <marex@denx.de>2015-08-05 17:20:35 +0200
commitab27f30b6e9489e71643c9654dc8690d82973ec8 (patch)
tree1981b46724900c4c826e6453b18353b84956b124
parent0fa5999bea643a81072f1e71a2fae976d00018a8 (diff)
sunxi: Drop our own copy of the USB_KEYBOARD options
USB_KEYBOARD is now defined in drivers/usb/Kconfig, drop our own duplicate definition. Signed-off-by: Hans de Goede <hdegoede@redhat.com>
-rw-r--r--arch/arm/Kconfig1
-rw-r--r--board/sunxi/Kconfig7
2 files changed, 1 insertions, 7 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 32fa2ddc579..8b8269fd13e 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -653,6 +653,7 @@ config ARCH_SUNXI
select SPL_DISABLE_OF_CONTROL
select USB
select USB_STORAGE
+ select USB_KEYBOARD
config TARGET_SNOWBALL
bool "Support snowball"
diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
index e1c5e1df403..c4b5a855a5e 100644
--- a/board/sunxi/Kconfig
+++ b/board/sunxi/Kconfig
@@ -539,13 +539,6 @@ config VIDEO_LCD_TL059WV5C0
endchoice
-config USB_KEYBOARD
- boolean "Enable USB keyboard support"
- default y
- ---help---
- Say Y here to add support for using a USB keyboard (typically used
- in combination with a graphical console).
-
config GMAC_TX_DELAY
int "GMAC Transmit Clock Delay Chain"
default 0