usb: gadget: start with libcomposite

This patch aims to be simple. It removes #include usbstribgs.c line from each
gadget and creates libcomposite.ko which has only one member, that is
usbstribgs.c.

Acked-by: Michal Nazarewicz <mina86@mina86.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Felipe Balbi <balbi@ti.com>

1 files changed, 25 insertions, 0 deletions

diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 75b76d5a0fe9..a53be32c22cf 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -494,6 +494,12 @@ endmenu
 #
 # USB Gadget Drivers
 #
+
+# composite based drivers
+config USB_LIBCOMPOSITE
+        tristate
+        depends on USB_GADGET
+
 choice
         tristate "USB Gadget Drivers"
         default USB_ETH
@@ -517,6 +523,7 @@ choice
 
 config USB_ZERO
         tristate "Gadget Zero (DEVELOPMENT)"
+        select USB_LIBCOMPOSITE
         help
           Gadget Zero is a two-configuration device.  It either sinks and
           sources bulk data; or it loops back a configurable number of
@@ -552,6 +559,7 @@ config USB_ZERO_HNPTEST
 config USB_AUDIO
         tristate "Audio Gadget (EXPERIMENTAL)"
         depends on SND
+        select USB_LIBCOMPOSITE
         select SND_PCM
         help
           This Gadget Audio driver is compatible with USB Audio Class
@@ -580,6 +588,7 @@ config GADGET_UAC1
 config USB_ETH
         tristate "Ethernet Gadget (with CDC Ethernet support)"
         depends on NET
+        select USB_LIBCOMPOSITE
         select CRC32
         help
           This driver implements Ethernet style communication, in one of
@@ -615,6 +624,7 @@ config USB_ETH
 config USB_ETH_RNDIS
         bool "RNDIS support"
         depends on USB_ETH
+        select USB_LIBCOMPOSITE
         default y
         help
            Microsoft Windows XP bundles the "Remote NDIS" (RNDIS) protocol,
@@ -633,6 +643,7 @@ config USB_ETH_RNDIS
 config USB_ETH_EEM
        bool "Ethernet Emulation Model (EEM) support"
        depends on USB_ETH
+        select USB_LIBCOMPOSITE
        default n
        help
          CDC EEM is a newer USB standard that is somewhat simpler than CDC ECM
@@ -649,6 +660,7 @@ config USB_ETH_EEM
 config USB_G_NCM
         tristate "Network Control Model (NCM) support"
         depends on NET
+        select USB_LIBCOMPOSITE
         select CRC32
         help
           This driver implements USB CDC NCM subclass standard. NCM is
@@ -678,6 +690,7 @@ config USB_GADGETFS
 config USB_FUNCTIONFS
         tristate "Function Filesystem (EXPERIMENTAL)"
         depends on EXPERIMENTAL
+        select USB_LIBCOMPOSITE
         select USB_FUNCTIONFS_GENERIC if !(USB_FUNCTIONFS_ETH || USB_FUNCTIONFS_RNDIS)
         help
           The Function Filesystem (FunctionFS) lets one create USB
@@ -741,6 +754,7 @@ config USB_FILE_STORAGE_TEST
 config USB_MASS_STORAGE
         tristate "Mass Storage Gadget"
         depends on BLOCK
+        select USB_LIBCOMPOSITE
         help
           The Mass Storage Gadget acts as a USB Mass Storage disk drive.
           As its storage repository it can use a regular file or a block
@@ -756,6 +770,7 @@ config USB_MASS_STORAGE
 config USB_GADGET_TARGET
         tristate "USB Gadget Target Fabric Module"
         depends on TARGET_CORE
+        select USB_LIBCOMPOSITE
         help
           This fabric is an USB gadget. Two USB protocols are supported that is
           BBB or BOT (Bulk Only Transport) and UAS (USB Attached SCSI). BOT is
@@ -765,6 +780,7 @@ config USB_GADGET_TARGET
 
 config USB_G_SERIAL
         tristate "Serial Gadget (with CDC ACM and CDC OBEX support)"
+        select USB_LIBCOMPOSITE
         help
           The Serial Gadget talks to the Linux-USB generic serial driver.
           This driver supports a CDC-ACM module option, which can be used
@@ -785,6 +801,7 @@ config USB_G_SERIAL
 config USB_MIDI_GADGET
         tristate "MIDI Gadget (EXPERIMENTAL)"
         depends on SND && EXPERIMENTAL
+        select USB_LIBCOMPOSITE
         select SND_RAWMIDI
         help
           The MIDI Gadget acts as a USB Audio device, with one MIDI
@@ -798,6 +815,7 @@ config USB_MIDI_GADGET
 
 config USB_G_PRINTER
         tristate "Printer Gadget"
+        select USB_LIBCOMPOSITE
         help
           The Printer Gadget channels data between the USB host and a
           userspace program driving the print engine. The user space
@@ -814,6 +832,7 @@ config USB_G_PRINTER
 config USB_CDC_COMPOSITE
         tristate "CDC Composite Device (Ethernet and ACM)"
         depends on NET
+        select USB_LIBCOMPOSITE
         help
           This driver provides two functions in one configuration:
           a CDC Ethernet (ECM) link, and a CDC ACM (serial port) link.
@@ -828,6 +847,7 @@ config USB_CDC_COMPOSITE
 config USB_G_NOKIA
         tristate "Nokia composite gadget"
         depends on PHONET
+        select USB_LIBCOMPOSITE
         help
           The Nokia composite gadget provides support for acm, obex
           and phonet in only one composite gadget driver.
@@ -838,6 +858,7 @@ config USB_G_NOKIA
 config USB_G_ACM_MS
         tristate "CDC Composite Device (ACM and mass storage)"
         depends on BLOCK
+        select USB_LIBCOMPOSITE
         help
           This driver provides two functions in one configuration:
           a mass storage, and a CDC ACM (serial port) link.
@@ -849,6 +870,7 @@ config USB_G_MULTI
         tristate "Multifunction Composite Gadget (EXPERIMENTAL)"
         depends on BLOCK && NET
         select USB_G_MULTI_CDC if !USB_G_MULTI_RNDIS
+        select USB_LIBCOMPOSITE
         help
           The Multifunction Composite Gadget provides Ethernet (RNDIS
           and/or CDC Ethernet), mass storage and ACM serial link
@@ -889,6 +911,7 @@ config USB_G_MULTI_CDC
 
 config USB_G_HID
         tristate "HID Gadget"
+        select USB_LIBCOMPOSITE
         help
           The HID gadget driver provides generic emulation of USB
           Human Interface Devices (HID).
@@ -899,8 +922,10 @@ config USB_G_HID
           Say "y" to link the driver statically, or "m" to build a
           dynamically linked module called "g_hid".
 
+# Standalone / single function gadgets
 config USB_G_DBGP
         tristate "EHCI Debug Device Gadget"
+        select USB_LIBCOMPOSITE
         help
           This gadget emulates an EHCI Debug device. This is useful when you want
           to interact with an EHCI Debug Port.