usb: gadget: allocate & giveback serial ports instead hard code them

[deliverable/linux.git] / drivers / usb / gadget / Kconfig

diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index e0ff51b895296ab66988e509bd6b73d94a663701..8aefbbddf2a78f506f93818b442bb8d511a861cc 100644 (file)
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -500,6 +500,12 @@ config USB_LIBCOMPOSITE
        tristate
        depends on USB_GADGET
 
+config USB_F_SS_LB
+       tristate
+
+config USB_U_SERIAL
+       tristate
+
 choice
        tristate "USB Gadget Drivers"
        default USB_ETH
@@ -524,6 +530,7 @@ choice
 config USB_ZERO
        tristate "Gadget Zero (DEVELOPMENT)"
        select USB_LIBCOMPOSITE
+       select USB_F_SS_LB
        help
          Gadget Zero is a two-configuration device.  It either sinks and
          sources bulk data; or it loops back a configurable number of
@@ -721,31 +728,6 @@ config USB_FUNCTIONFS_GENERIC
          Include a configuration with the Function Filesystem alone with
          no Ethernet interface.
 
-config USB_FILE_STORAGE
-       tristate "File-backed Storage Gadget (DEPRECATED)"
-       depends on BLOCK
-       help
-         The File-backed Storage Gadget acts as a USB Mass Storage
-         disk drive.  As its storage repository it can use a regular
-         file or a block device (in much the same way as the "loop"
-         device driver), specified as a module parameter.
-
-         Say "y" to link the driver statically, or "m" to build a
-         dynamically linked module called "g_file_storage".
-
-         NOTE: This driver is deprecated.  Its replacement is the
-         Mass Storage Gadget.
-
-config USB_FILE_STORAGE_TEST
-       bool "File-backed Storage Gadget testing version"
-       depends on USB_FILE_STORAGE
-       default n
-       help
-         Say "y" to generate the larger testing version of the
-         File-backed Storage Gadget, useful for probing the
-         behavior of USB Mass Storage hosts.  Not needed for
-         normal operation.
-
 config USB_MASS_STORAGE
        tristate "Mass Storage Gadget"
        depends on BLOCK
@@ -756,8 +738,8 @@ config USB_MASS_STORAGE
          device (in much the same way as the "loop" device driver),
          specified as a module parameter or sysfs option.
 
-         This driver is an updated replacement for the deprecated
-         File-backed Storage Gadget (g_file_storage).
+         This driver is a replacement for now removed File-backed
+         Storage Gadget (g_file_storage).
 
          Say "y" to link the driver statically, or "m" to build
          a dynamically linked module called "g_mass_storage".
@@ -775,6 +757,7 @@ config USB_GADGET_TARGET
 
 config USB_G_SERIAL
        tristate "Serial Gadget (with CDC ACM and CDC OBEX support)"
+       select USB_U_SERIAL
        select USB_LIBCOMPOSITE
        help
          The Serial Gadget talks to the Linux-USB generic serial driver.
@@ -828,6 +811,7 @@ config USB_CDC_COMPOSITE
        tristate "CDC Composite Device (Ethernet and ACM)"
        depends on NET
        select USB_LIBCOMPOSITE
+       select USB_U_SERIAL
        help
          This driver provides two functions in one configuration:
          a CDC Ethernet (ECM) link, and a CDC ACM (serial port) link.
@@ -843,6 +827,7 @@ config USB_G_NOKIA
        tristate "Nokia composite gadget"
        depends on PHONET
        select USB_LIBCOMPOSITE
+       select USB_U_SERIAL
        help
          The Nokia composite gadget provides support for acm, obex
          and phonet in only one composite gadget driver.
@@ -854,6 +839,7 @@ config USB_G_ACM_MS
        tristate "CDC Composite Device (ACM and mass storage)"
        depends on BLOCK
        select USB_LIBCOMPOSITE
+       select USB_U_SERIAL
        help
          This driver provides two functions in one configuration:
          a mass storage, and a CDC ACM (serial port) link.
@@ -866,6 +852,7 @@ config USB_G_MULTI
        depends on BLOCK && NET
        select USB_G_MULTI_CDC if !USB_G_MULTI_RNDIS
        select USB_LIBCOMPOSITE
+       select USB_U_SERIAL
        help
          The Multifunction Composite Gadget provides Ethernet (RNDIS
          and/or CDC Ethernet), mass storage and ACM serial link
@@ -941,6 +928,7 @@ config USB_G_DBGP_PRINTK
 
 config USB_G_DBGP_SERIAL
        depends on USB_G_DBGP
+       select USB_U_SERIAL
        bool "serial"
        help
          Userland can interact using /dev/ttyGSxxx.