On Thursday, July 23, 2015 at 04:19:35 PM, Nikita Kiryanov wrote:
Add USB_EHCI_MX6 option to menuconfig and use it when migrating cm-fx6 usb config to defconfig.
Cc: Masahiro Yamada yamada.masahiro@socionext.com Cc: Marek Vasut marex@denx.de Cc: Stefano Babic sbabic@denx.de Cc: Igor Grinberg grinberg@compulab.co.il Signed-off-by: Nikita Kiryanov nikita@compulab.co.il
configs/cm_fx6_defconfig | 4 ++++ drivers/usb/host/Kconfig | 7 +++++++ include/configs/cm_fx6.h | 3 --- 3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig index 7ad5c21..07a84bb 100644 --- a/configs/cm_fx6_defconfig +++ b/configs/cm_fx6_defconfig @@ -15,4 +15,8 @@ CONFIG_CMD_PING=y CONFIG_SPI_FLASH=y CONFIG_CMD_SF=y CONFIG_CMD_I2C=y +CONFIG_USB=y CONFIG_CMD_USB=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_MX6=y +CONFIG_USB_STORAGE=y diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 8705c7c..b30b43d 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -52,6 +52,13 @@ config USB_EHCI
if USB_EHCI_HCD
+config USB_EHCI_MX6
- bool "Support for i.MX6 on-chip EHCI USB controller"
- depends on ARCH_MX6
- default y
- ---help---
Enables support for the on-chip EHCI controller on i.MX6 SoCs.config USB_EHCI_UNIPHIER bool "Support for UniPhier on-chip EHCI USB controller" depends on ARCH_UNIPHIER && OF_CONTROL diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index 9b00c0d..9f69322 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -198,9 +198,6 @@ #define CONFIG_NET_RETRY_COUNT 5
/* USB */ -#define CONFIG_USB_EHCI -#define CONFIG_USB_EHCI_MX6 -#define CONFIG_USB_STORAGE #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
Can you please also convert the rest of the boards ?
Best regards, Marek Vasut