[U-Boot] [PATCH v2 07/11] usb: USB_KEYBOARD move to usb Kconfig and USB peripherals support on USB_HCD

[Paul Kocialkowski]

The USB_KEYBOARD Kconfig is not specific to sunxi, so we can move it to the
common USB Kconfig.

In addition, USB_KEYBOARD and USB_STORAGE should be enabled when an USB host
controller is enabled.

Signed-off-by: Paul Kocialkowski <contact at paulk.fr>
---
 arch/arm/Kconfig    |  1 -
 board/sunxi/Kconfig |  8 --------
 drivers/usb/Kconfig | 12 ++++++++++++
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 36aa4e9..41f517d 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -653,7 +653,6 @@ config ARCH_SUNXI
 	select OF_SEPARATE
 	select SPL_DISABLE_OF_CONTROL
 	select USB
-	select USB_STORAGE
 
 config TARGET_SNOWBALL
 	bool "Support snowball"
diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
index e1c5e1d..b156701 100644
--- a/board/sunxi/Kconfig
+++ b/board/sunxi/Kconfig
@@ -538,14 +538,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
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 4e9335f..4e1f2fb 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -60,12 +60,24 @@ source "drivers/usb/musb-new/Kconfig"
 
 source "drivers/usb/emul/Kconfig"
 
+if USB_HCD
+
 comment "USB peripherals"
 
 config USB_STORAGE
 	bool "USB Mass Storage support"
+	default y
 	---help---
 	  Say Y here if you want to connect USB mass storage devices to your
 	  board's USB port.
 
+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).
+
+endif
+
 endif
-- 
1.9.1