From f8515e706120de1f34a97d263cebbd17b0eaea73 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Tue, 26 Jan 2016 15:55:47 -0800 Subject: apalis/colibri_imx6: synchronize USB serial options Compile USB device classes such as WDM and CDC ACM as modules. Enable FTDI USB-to-serial adapter chips and serial console which allows to use USB serial device drivers as a serial console at boot time. Compile USB driver for GSM and CDMA modems (Option and others) as a module. Signed-off-by: Stefan Agner Acked-by: Max Krummenacher --- arch/arm/configs/apalis_imx6_defconfig | 7 +++++-- arch/arm/configs/colibri_imx6_defconfig | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'arch') diff --git a/arch/arm/configs/apalis_imx6_defconfig b/arch/arm/configs/apalis_imx6_defconfig index 4c7be40928ae..be234fa52ef8 100644 --- a/arch/arm/configs/apalis_imx6_defconfig +++ b/arch/arm/configs/apalis_imx6_defconfig @@ -244,15 +244,18 @@ CONFIG_HID_MULTITOUCH=m CONFIG_USB_HIDDEV=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y +CONFIG_USB_ACM=m +CONFIG_USB_WDM=m CONFIG_USB_STORAGE=y CONFIG_USB_CHIPIDEA=y CONFIG_USB_CHIPIDEA_UDC=y CONFIG_USB_CHIPIDEA_HOST=y CONFIG_USB_SERIAL=y +CONFIG_USB_SERIAL_CONSOLE=y CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_FTDI_SIO=y CONFIG_USB_SERIAL_PL2303=y -CONFIG_USB_SERIAL_QUALCOMM=y -CONFIG_USB_SERIAL_OPTION=y +CONFIG_USB_SERIAL_OPTION=m CONFIG_USB_MXS_PHY=y CONFIG_USB_GADGET=y CONFIG_USB_ZERO=m diff --git a/arch/arm/configs/colibri_imx6_defconfig b/arch/arm/configs/colibri_imx6_defconfig index ac6f0fb1fabf..535f89aab937 100644 --- a/arch/arm/configs/colibri_imx6_defconfig +++ b/arch/arm/configs/colibri_imx6_defconfig @@ -234,15 +234,18 @@ CONFIG_HID_MULTITOUCH=m CONFIG_USB_HIDDEV=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y +CONFIG_USB_ACM=m +CONFIG_USB_WDM=m CONFIG_USB_STORAGE=y CONFIG_USB_CHIPIDEA=y CONFIG_USB_CHIPIDEA_UDC=y CONFIG_USB_CHIPIDEA_HOST=y CONFIG_USB_SERIAL=y +CONFIG_USB_SERIAL_CONSOLE=y CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_FTDI_SIO=y CONFIG_USB_SERIAL_PL2303=y -CONFIG_USB_SERIAL_QUALCOMM=y -CONFIG_USB_SERIAL_OPTION=y +CONFIG_USB_SERIAL_OPTION=m CONFIG_USB_MXS_PHY=y CONFIG_USB_GADGET=y CONFIG_USB_ZERO=m -- cgit v1.2.3