From de1502c937c75527a08b40380ceb4824ae9ac86c Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Wed, 17 Jun 2015 20:54:07 +0200 Subject: [PATCH] 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 Acked-by: Ian Campbell Reviewed-by: Simon Glass --- arch/arm/Kconfig | 2 ++ include/configs/sunxi-common.h | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 56abaf6..0e899cd 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 9576bc1..5adcc39 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