sunxi: Enable CMD_USB and USB_STORAGE by default on sunxi

Start using the new Kconfig options which are available for these now,
and simply always enable them by selecting them as sunxi builds always
include USB support.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 56abaf6c405a99a0db50f8c6dedbb4138c5726b4..0e899cd0d945bd906da2faba3230d3767a5fbdc1 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -643,6 +643,7 @@ config ARCH_SOCFPGA
 
 config ARCH_SUNXI
        bool "Support sunxi (Allwinner) SoCs"
+       select CMD_USB
        select DM
        select DM_GPIO
        select DM_ETH
@@ -652,6 +653,7 @@ 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/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 9576bc1a20c1b2196618e46fd930c9e7ea02e117..5adcc39e02a9360890c3e8434260080064c674c5 100644 (file)
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -330,11 +330,6 @@ extern int soft_i2c_gpio_scl;
 #define CONFIG_MUSB_PIO_ONLY
 #endif
 
-#if defined CONFIG_USB_EHCI || defined CONFIG_USB_MUSB_SUNXI
-#define CONFIG_CMD_USB
-#define CONFIG_USB_STORAGE
-#endif
-
 #ifdef CONFIG_USB_KEYBOARD
 #define CONFIG_CONSOLE_MUX
 #define CONFIG_PREBOOT