[PATCH 4/6] Config USB Composite gadget support
Ragner Magalhaes <[email protected]>
| Newsgroups | gmane.linux.usb.devel |
|---|---|
| Message-ID | <[email protected]> |
From: Ragner Magalhaes <[email protected]> Kconfig modifications for USB Composite gadget support. Signed-off-by: Felipe Balbi <[email protected]> Signed-off-by: Ragner Magalhaes <[email protected]> --- drivers/usb/gadget/Kconfig | 10 ++++++++++ drivers/usb/gadget/Makefile | 12 +++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index d4c7a41..fff5650 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig @@ -303,6 +303,16 @@ choice # this first set of drivers all depend on bulk-capable hardware. +config USB_COMPOSITE + tristate "Composite Gadget Support" + depends on USB_GADGET + help + The Composite Gadget is a gadget driver that allow to work + with multiples gadget functions together. + + This module adds support for File Storage and Ethernet Gadget + to work as Composite Gadget. + config USB_ZERO tristate "Gadget Zero (DEVELOPMENT)" depends on EXPERIMENTAL diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile index 5db1939..bda57e1 100644 --- a/drivers/usb/gadget/Makefile +++ b/drivers/usb/gadget/Makefile @@ -13,22 +13,28 @@ obj-$(CONFIG_USB_FSL_USB2) += fsl_usb2_udc.o # # USB gadget drivers # +ifndef CONFIG_USB_COMPOSITE +GADGET := gadget.o +endif g_zero-objs := zero.o usbstring.o config.o epautoconf.o -g_ether-objs := ether.o usbstring.o config.o epautoconf.o +g_ether-objs := ether.o usbstring.o config.o epautoconf.o \ + $(GADGET) g_serial-objs := serial.o usbstring.o config.o epautoconf.o g_midi-objs := gmidi.o usbstring.o config.o epautoconf.o gadgetfs-objs := inode.o g_file_storage-objs := file_storage.o usbstring.o config.o \ + epautoconf.o $(GADGET) +g_composite-objs := composite.o usbstring.o config.o \ epautoconf.o ifeq ($(CONFIG_USB_ETH_RNDIS),y) g_ether-objs += rndis.o endif - + obj-$(CONFIG_USB_ZERO) += g_zero.o obj-$(CONFIG_USB_ETH) += g_ether.o obj-$(CONFIG_USB_GADGETFS) += gadgetfs.o obj-$(CONFIG_USB_FILE_STORAGE) += g_file_storage.o obj-$(CONFIG_USB_G_SERIAL) += g_serial.o obj-$(CONFIG_USB_MIDI_GADGET) += g_midi.o - +obj-$(CONFIG_USB_COMPOSITE) += g_composite.o ------------------------------------------------------------------------- This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ _______________________________________________ [email protected] To unsubscribe, use the last form field at: https://lists.sourceforge.net/lists/listinfo/linux-usb-devel