summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2015-06-17 20:54:07 +0200
committerHans de Goede <hdegoede@redhat.com>2015-07-25 11:22:54 +0200
commitde1502c937c75527a08b40380ceb4824ae9ac86c (patch)
tree585d72e00575af7dfaaf04e9f2974ec8679f5dd7
parent4536882710b598556b943f58e7713c92ada7ec5f (diff)
downloadtalos-obmc-uboot-de1502c937c75527a08b40380ceb4824ae9ac86c.tar.gz
talos-obmc-uboot-de1502c937c75527a08b40380ceb4824ae9ac86c.zip
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>
-rw-r--r--arch/arm/Kconfig2
-rw-r--r--include/configs/sunxi-common.h5
2 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 56abaf6c40..0e899cd0d9 100644
--- 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 9576bc1a20..5adcc39e02 100644
--- 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
OpenPOWER on IntegriCloud