diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2016-01-26 15:55:47 -0800 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2017-01-10 23:13:21 +0100 |
| commit | 9b5ea047d87940264d7ae7144c86c30f5459e114 (patch) | |
| tree | 54dfb7fec95bfa1c09b8e19460c7038b43fc3c68 | |
| parent | 0d85191ac6663ea3e2ff84d96f20c62144549f27 (diff) | |
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 <stefan.agner@toradex.com>
Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
(cherry picked from commit f8515e706120de1f34a97d263cebbd17b0eaea73)
| -rw-r--r-- | arch/arm/configs/apalis_imx6_defconfig | 7 | ||||
| -rw-r--r-- | arch/arm/configs/colibri_imx6_defconfig | 7 |
2 files changed, 10 insertions, 4 deletions
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 |