diff options
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/atm/Makefile | 4 | ||||
-rw-r--r-- | drivers/usb/c67x00/Makefile | 6 | ||||
-rw-r--r-- | drivers/usb/core/Makefile | 19 | ||||
-rw-r--r-- | drivers/usb/early/Makefile | 2 | ||||
-rw-r--r-- | drivers/usb/gadget/Makefile | 39 | ||||
-rw-r--r-- | drivers/usb/host/Makefile | 19 | ||||
-rw-r--r-- | drivers/usb/host/whci/Kbuild | 2 | ||||
-rw-r--r-- | drivers/usb/misc/Makefile | 44 | ||||
-rw-r--r-- | drivers/usb/misc/sisusbvga/Makefile | 3 | ||||
-rw-r--r-- | drivers/usb/mon/Makefile | 2 | ||||
-rw-r--r-- | drivers/usb/musb/Makefile | 71 | ||||
-rw-r--r-- | drivers/usb/otg/Makefile | 7 | ||||
-rw-r--r-- | drivers/usb/serial/Makefile | 9 | ||||
-rw-r--r-- | drivers/usb/storage/Makefile | 34 | ||||
-rw-r--r-- | drivers/usb/wusbcore/Makefile | 17 |
15 files changed, 116 insertions, 162 deletions
diff --git a/drivers/usb/atm/Makefile b/drivers/usb/atm/Makefile index d40a126e47a3..a5d792ec3ad5 100644 --- a/drivers/usb/atm/Makefile +++ b/drivers/usb/atm/Makefile | |||
@@ -2,10 +2,10 @@ | |||
2 | # Makefile for USB ATM/xDSL drivers | 2 | # Makefile for USB ATM/xDSL drivers |
3 | # | 3 | # |
4 | 4 | ||
5 | ccflags-$(CONFIG_USB_DEBUG) := -DDEBUG | ||
6 | |||
5 | obj-$(CONFIG_USB_CXACRU) += cxacru.o | 7 | obj-$(CONFIG_USB_CXACRU) += cxacru.o |
6 | obj-$(CONFIG_USB_SPEEDTOUCH) += speedtch.o | 8 | obj-$(CONFIG_USB_SPEEDTOUCH) += speedtch.o |
7 | obj-$(CONFIG_USB_UEAGLEATM) += ueagle-atm.o | 9 | obj-$(CONFIG_USB_UEAGLEATM) += ueagle-atm.o |
8 | obj-$(CONFIG_USB_ATM) += usbatm.o | 10 | obj-$(CONFIG_USB_ATM) += usbatm.o |
9 | obj-$(CONFIG_USB_XUSBATM) += xusbatm.o | 11 | obj-$(CONFIG_USB_XUSBATM) += xusbatm.o |
10 | |||
11 | ccflags-$(CONFIG_USB_DEBUG) := -DDEBUG | ||
diff --git a/drivers/usb/c67x00/Makefile b/drivers/usb/c67x00/Makefile index 868bc41b5980..b1218683c8ec 100644 --- a/drivers/usb/c67x00/Makefile +++ b/drivers/usb/c67x00/Makefile | |||
@@ -2,8 +2,8 @@ | |||
2 | # Makefile for Cypress C67X00 USB Controller | 2 | # Makefile for Cypress C67X00 USB Controller |
3 | # | 3 | # |
4 | 4 | ||
5 | ccflags-$(CONFIG_USB_DEBUG) += -DDEBUG | 5 | ccflags-$(CONFIG_USB_DEBUG) := -DDEBUG |
6 | 6 | ||
7 | obj-$(CONFIG_USB_C67X00_HCD) += c67x00.o | 7 | obj-$(CONFIG_USB_C67X00_HCD) += c67x00.o |
8 | 8 | ||
9 | c67x00-objs := c67x00-drv.o c67x00-ll-hpi.o c67x00-hcd.o c67x00-sched.o | 9 | c67x00-y := c67x00-drv.o c67x00-ll-hpi.o c67x00-hcd.o c67x00-sched.o |
diff --git a/drivers/usb/core/Makefile b/drivers/usb/core/Makefile index 17c8e2d2a07d..507a4e1b6360 100644 --- a/drivers/usb/core/Makefile +++ b/drivers/usb/core/Makefile | |||
@@ -2,18 +2,13 @@ | |||
2 | # Makefile for USB Core files and filesystem | 2 | # Makefile for USB Core files and filesystem |
3 | # | 3 | # |
4 | 4 | ||
5 | usbcore-objs := usb.o hub.o hcd.o urb.o message.o driver.o \ | 5 | ccflags-$(CONFIG_USB_DEBUG) := -DDEBUG |
6 | config.o file.o buffer.o sysfs.o endpoint.o \ | ||
7 | devio.o notify.o generic.o quirks.o devices.o | ||
8 | |||
9 | ifeq ($(CONFIG_PCI),y) | ||
10 | usbcore-objs += hcd-pci.o | ||
11 | endif | ||
12 | 6 | ||
13 | ifeq ($(CONFIG_USB_DEVICEFS),y) | 7 | usbcore-y := usb.o hub.o hcd.o urb.o message.o driver.o |
14 | usbcore-objs += inode.o | 8 | usbcore-y += config.o file.o buffer.o sysfs.o endpoint.o |
15 | endif | 9 | usbcore-y += devio.o notify.o generic.o quirks.o devices.o |
16 | 10 | ||
17 | obj-$(CONFIG_USB) += usbcore.o | 11 | usbcore-$(CONFIG_PCI) += hcd-pci.o |
12 | usbcore-$(CONFIG_USB_DEVICEFS) += inode.o | ||
18 | 13 | ||
19 | ccflags-$(CONFIG_USB_DEBUG) := -DDEBUG | 14 | obj-$(CONFIG_USB) += usbcore.o |
diff --git a/drivers/usb/early/Makefile b/drivers/usb/early/Makefile index dfedee8c45b6..24bbe519c737 100644 --- a/drivers/usb/early/Makefile +++ b/drivers/usb/early/Makefile | |||
@@ -2,4 +2,4 @@ | |||
2 | # Makefile for early USB devices | 2 | # Makefile for early USB devices |
3 | # | 3 | # |
4 | 4 | ||
5 | obj-$(CONFIG_EARLY_PRINTK_DBGP) += ehci-dbgp.o | 5 | obj-$(CONFIG_EARLY_PRINTK_DBGP) += ehci-dbgp.o |
diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile index c68200536500..5780db42417b 100644 --- a/drivers/usb/gadget/Makefile +++ b/drivers/usb/gadget/Makefile | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # USB peripheral controller drivers | 2 | # USB peripheral controller drivers |
3 | # | 3 | # |
4 | ccflags-$(CONFIG_USB_GADGET_DEBUG) := -DDEBUG | 4 | ccflags-$(CONFIG_USB_GADGET_DEBUG) := -DDEBUG |
5 | 5 | ||
6 | obj-$(CONFIG_USB_DUMMY_HCD) += dummy_hcd.o | 6 | obj-$(CONFIG_USB_DUMMY_HCD) += dummy_hcd.o |
7 | obj-$(CONFIG_USB_NET2280) += net2280.o | 7 | obj-$(CONFIG_USB_NET2280) += net2280.o |
@@ -16,10 +16,8 @@ obj-$(CONFIG_USB_S3C2410) += s3c2410_udc.o | |||
16 | obj-$(CONFIG_USB_AT91) += at91_udc.o | 16 | obj-$(CONFIG_USB_AT91) += at91_udc.o |
17 | obj-$(CONFIG_USB_ATMEL_USBA) += atmel_usba_udc.o | 17 | obj-$(CONFIG_USB_ATMEL_USBA) += atmel_usba_udc.o |
18 | obj-$(CONFIG_USB_FSL_USB2) += fsl_usb2_udc.o | 18 | obj-$(CONFIG_USB_FSL_USB2) += fsl_usb2_udc.o |
19 | fsl_usb2_udc-objs := fsl_udc_core.o | 19 | fsl_usb2_udc-y := fsl_udc_core.o |
20 | ifeq ($(CONFIG_ARCH_MXC),y) | 20 | fsl_usb2_udc-$(CONFIG_ARCH_MXC) += fsl_mxc_udc.o |
21 | fsl_usb2_udc-objs += fsl_mxc_udc.o | ||
22 | endif | ||
23 | obj-$(CONFIG_USB_M66592) += m66592-udc.o | 21 | obj-$(CONFIG_USB_M66592) += m66592-udc.o |
24 | obj-$(CONFIG_USB_R8A66597) += r8a66597-udc.o | 22 | obj-$(CONFIG_USB_R8A66597) += r8a66597-udc.o |
25 | obj-$(CONFIG_USB_FSL_QE) += fsl_qe_udc.o | 23 | obj-$(CONFIG_USB_FSL_QE) += fsl_qe_udc.o |
@@ -30,21 +28,21 @@ obj-$(CONFIG_USB_LANGWELL) += langwell_udc.o | |||
30 | # | 28 | # |
31 | # USB gadget drivers | 29 | # USB gadget drivers |
32 | # | 30 | # |
33 | g_zero-objs := zero.o | 31 | g_zero-y := zero.o |
34 | g_audio-objs := audio.o | 32 | g_audio-y := audio.o |
35 | g_ether-objs := ether.o | 33 | g_ether-y := ether.o |
36 | g_serial-objs := serial.o | 34 | g_serial-y := serial.o |
37 | g_midi-objs := gmidi.o | 35 | g_midi-y := gmidi.o |
38 | gadgetfs-objs := inode.o | 36 | gadgetfs-y := inode.o |
39 | g_file_storage-objs := file_storage.o | 37 | g_file_storage-y := file_storage.o |
40 | g_mass_storage-objs := mass_storage.o | 38 | g_mass_storage-y := mass_storage.o |
41 | g_printer-objs := printer.o | 39 | g_printer-y := printer.o |
42 | g_cdc-objs := cdc2.o | 40 | g_cdc-y := cdc2.o |
43 | g_multi-objs := multi.o | 41 | g_multi-y := multi.o |
44 | g_hid-objs := hid.o | 42 | g_hid-y := hid.o |
45 | g_dbgp-objs := dbgp.o | 43 | g_dbgp-y := dbgp.o |
46 | g_nokia-objs := nokia.o | 44 | g_nokia-y := nokia.o |
47 | g_webcam-objs := webcam.o | 45 | g_webcam-y := webcam.o |
48 | 46 | ||
49 | obj-$(CONFIG_USB_ZERO) += g_zero.o | 47 | obj-$(CONFIG_USB_ZERO) += g_zero.o |
50 | obj-$(CONFIG_USB_AUDIO) += g_audio.o | 48 | obj-$(CONFIG_USB_AUDIO) += g_audio.o |
@@ -62,4 +60,3 @@ obj-$(CONFIG_USB_G_DBGP) += g_dbgp.o | |||
62 | obj-$(CONFIG_USB_G_MULTI) += g_multi.o | 60 | obj-$(CONFIG_USB_G_MULTI) += g_multi.o |
63 | obj-$(CONFIG_USB_G_NOKIA) += g_nokia.o | 61 | obj-$(CONFIG_USB_G_NOKIA) += g_nokia.o |
64 | obj-$(CONFIG_USB_G_WEBCAM) += g_webcam.o | 62 | obj-$(CONFIG_USB_G_WEBCAM) += g_webcam.o |
65 | |||
diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile index 19b3a30b1cdb..91c5a1bd1026 100644 --- a/drivers/usb/host/Makefile +++ b/drivers/usb/host/Makefile | |||
@@ -2,15 +2,17 @@ | |||
2 | # Makefile for USB Host Controller Drivers | 2 | # Makefile for USB Host Controller Drivers |
3 | # | 3 | # |
4 | 4 | ||
5 | ccflags-$(CONFIG_USB_DEBUG) := -DDEBUG | 5 | ccflags-$(CONFIG_USB_DEBUG) := -DDEBUG |
6 | 6 | ||
7 | isp1760-objs := isp1760-hcd.o isp1760-if.o | 7 | isp1760-y := isp1760-hcd.o isp1760-if.o |
8 | fhci-objs := fhci-hcd.o fhci-hub.o fhci-q.o fhci-mem.o \ | 8 | |
9 | fhci-tds.o fhci-sched.o | 9 | fhci-y := fhci-hcd.o fhci-hub.o fhci-q.o |
10 | ifeq ($(CONFIG_FHCI_DEBUG),y) | 10 | fhci-y += fhci-mem.o fhci-tds.o fhci-sched.o |
11 | fhci-objs += fhci-dbg.o | 11 | |
12 | endif | 12 | fhci-$(CONFIG_FHCI_DEBUG) += fhci-dbg.o |
13 | xhci-hcd-objs := xhci.o xhci-mem.o xhci-pci.o xhci-ring.o xhci-hub.o xhci-dbg.o | 13 | |
14 | xhci-hcd-y := xhci.o xhci-mem.o xhci-pci.o | ||
15 | xhci-hcd-y += xhci-ring.o xhci-hub.o xhci-dbg.o | ||
14 | 16 | ||
15 | obj-$(CONFIG_USB_WHCI_HCD) += whci/ | 17 | obj-$(CONFIG_USB_WHCI_HCD) += whci/ |
16 | 18 | ||
@@ -32,4 +34,3 @@ obj-$(CONFIG_USB_ISP1760_HCD) += isp1760.o | |||
32 | obj-$(CONFIG_USB_HWA_HCD) += hwa-hc.o | 34 | obj-$(CONFIG_USB_HWA_HCD) += hwa-hc.o |
33 | obj-$(CONFIG_USB_IMX21_HCD) += imx21-hcd.o | 35 | obj-$(CONFIG_USB_IMX21_HCD) += imx21-hcd.o |
34 | obj-$(CONFIG_USB_FSL_MPH_DR_OF) += fsl-mph-dr-of.o | 36 | obj-$(CONFIG_USB_FSL_MPH_DR_OF) += fsl-mph-dr-of.o |
35 | |||
diff --git a/drivers/usb/host/whci/Kbuild b/drivers/usb/host/whci/Kbuild index 11e5040b8337..26df0138079e 100644 --- a/drivers/usb/host/whci/Kbuild +++ b/drivers/usb/host/whci/Kbuild | |||
@@ -3,7 +3,7 @@ obj-$(CONFIG_USB_WHCI_HCD) += whci-hcd.o | |||
3 | whci-hcd-y := \ | 3 | whci-hcd-y := \ |
4 | asl.o \ | 4 | asl.o \ |
5 | debug.o \ | 5 | debug.o \ |
6 | hcd.o \ | 6 | hcd.o \ |
7 | hw.o \ | 7 | hw.o \ |
8 | init.o \ | 8 | init.o \ |
9 | int.o \ | 9 | int.o \ |
diff --git a/drivers/usb/misc/Makefile b/drivers/usb/misc/Makefile index d2633c035626..796ce7ebccc8 100644 --- a/drivers/usb/misc/Makefile +++ b/drivers/usb/misc/Makefile | |||
@@ -3,27 +3,27 @@ | |||
3 | # (the ones that don't fit into any other categories) | 3 | # (the ones that don't fit into any other categories) |
4 | # | 4 | # |
5 | 5 | ||
6 | obj-$(CONFIG_USB_ADUTUX) += adutux.o | 6 | ccflags-$(CONFIG_USB_DEBUG) := -DDEBUG |
7 | obj-$(CONFIG_USB_APPLEDISPLAY) += appledisplay.o | ||
8 | obj-$(CONFIG_USB_CYPRESS_CY7C63)+= cypress_cy7c63.o | ||
9 | obj-$(CONFIG_USB_CYTHERM) += cytherm.o | ||
10 | obj-$(CONFIG_USB_EMI26) += emi26.o | ||
11 | obj-$(CONFIG_USB_EMI62) += emi62.o | ||
12 | obj-$(CONFIG_USB_FTDI_ELAN) += ftdi-elan.o | ||
13 | obj-$(CONFIG_USB_IDMOUSE) += idmouse.o | ||
14 | obj-$(CONFIG_USB_IOWARRIOR) += iowarrior.o | ||
15 | obj-$(CONFIG_USB_ISIGHTFW) += isight_firmware.o | ||
16 | obj-$(CONFIG_USB_LCD) += usblcd.o | ||
17 | obj-$(CONFIG_USB_LD) += ldusb.o | ||
18 | obj-$(CONFIG_USB_LED) += usbled.o | ||
19 | obj-$(CONFIG_USB_LEGOTOWER) += legousbtower.o | ||
20 | obj-$(CONFIG_USB_RIO500) += rio500.o | ||
21 | obj-$(CONFIG_USB_TEST) += usbtest.o | ||
22 | obj-$(CONFIG_USB_TRANCEVIBRATOR) += trancevibrator.o | ||
23 | obj-$(CONFIG_USB_USS720) += uss720.o | ||
24 | obj-$(CONFIG_USB_SEVSEG) += usbsevseg.o | ||
25 | obj-$(CONFIG_USB_YUREX) += yurex.o | ||
26 | 7 | ||
27 | obj-$(CONFIG_USB_SISUSBVGA) += sisusbvga/ | 8 | obj-$(CONFIG_USB_ADUTUX) += adutux.o |
9 | obj-$(CONFIG_USB_APPLEDISPLAY) += appledisplay.o | ||
10 | obj-$(CONFIG_USB_CYPRESS_CY7C63) += cypress_cy7c63.o | ||
11 | obj-$(CONFIG_USB_CYTHERM) += cytherm.o | ||
12 | obj-$(CONFIG_USB_EMI26) += emi26.o | ||
13 | obj-$(CONFIG_USB_EMI62) += emi62.o | ||
14 | obj-$(CONFIG_USB_FTDI_ELAN) += ftdi-elan.o | ||
15 | obj-$(CONFIG_USB_IDMOUSE) += idmouse.o | ||
16 | obj-$(CONFIG_USB_IOWARRIOR) += iowarrior.o | ||
17 | obj-$(CONFIG_USB_ISIGHTFW) += isight_firmware.o | ||
18 | obj-$(CONFIG_USB_LCD) += usblcd.o | ||
19 | obj-$(CONFIG_USB_LD) += ldusb.o | ||
20 | obj-$(CONFIG_USB_LED) += usbled.o | ||
21 | obj-$(CONFIG_USB_LEGOTOWER) += legousbtower.o | ||
22 | obj-$(CONFIG_USB_RIO500) += rio500.o | ||
23 | obj-$(CONFIG_USB_TEST) += usbtest.o | ||
24 | obj-$(CONFIG_USB_TRANCEVIBRATOR) += trancevibrator.o | ||
25 | obj-$(CONFIG_USB_USS720) += uss720.o | ||
26 | obj-$(CONFIG_USB_SEVSEG) += usbsevseg.o | ||
27 | obj-$(CONFIG_USB_YUREX) += yurex.o | ||
28 | 28 | ||
29 | ccflags-$(CONFIG_USB_DEBUG) := -DDEBUG | 29 | obj-$(CONFIG_USB_SISUSBVGA) += sisusbvga/ |
diff --git a/drivers/usb/misc/sisusbvga/Makefile b/drivers/usb/misc/sisusbvga/Makefile index 7f934cfc906c..3142476ccc8e 100644 --- a/drivers/usb/misc/sisusbvga/Makefile +++ b/drivers/usb/misc/sisusbvga/Makefile | |||
@@ -4,5 +4,4 @@ | |||
4 | 4 | ||
5 | obj-$(CONFIG_USB_SISUSBVGA) += sisusbvga.o | 5 | obj-$(CONFIG_USB_SISUSBVGA) += sisusbvga.o |
6 | 6 | ||
7 | sisusbvga-objs := sisusb.o sisusb_init.o sisusb_con.o | 7 | sisusbvga-y := sisusb.o sisusb_init.o sisusb_con.o |
8 | |||
diff --git a/drivers/usb/mon/Makefile b/drivers/usb/mon/Makefile index 384b198faa7c..8ed24ab08698 100644 --- a/drivers/usb/mon/Makefile +++ b/drivers/usb/mon/Makefile | |||
@@ -2,6 +2,6 @@ | |||
2 | # Makefile for USB monitor | 2 | # Makefile for USB monitor |
3 | # | 3 | # |
4 | 4 | ||
5 | usbmon-objs := mon_main.o mon_stat.o mon_text.o mon_bin.o | 5 | usbmon-y := mon_main.o mon_stat.o mon_text.o mon_bin.o |
6 | 6 | ||
7 | obj-$(CONFIG_USB_MON) += usbmon.o | 7 | obj-$(CONFIG_USB_MON) += usbmon.o |
diff --git a/drivers/usb/musb/Makefile b/drivers/usb/musb/Makefile index 16aaae28714d..ffc0e0525823 100644 --- a/drivers/usb/musb/Makefile +++ b/drivers/usb/musb/Makefile | |||
@@ -2,53 +2,23 @@ | |||
2 | # for USB OTG silicon based on Mentor Graphics INVENTRA designs | 2 | # for USB OTG silicon based on Mentor Graphics INVENTRA designs |
3 | # | 3 | # |
4 | 4 | ||
5 | musb_hdrc-objs := musb_core.o | 5 | ccflags-$(CONFIG_USB_MUSB_DEBUG) := -DDEBUG |
6 | |||
7 | obj-$(CONFIG_USB_MUSB_HDRC) += musb_hdrc.o | ||
8 | |||
9 | ifeq ($(CONFIG_ARCH_DAVINCI_DMx),y) | ||
10 | musb_hdrc-objs += davinci.o | ||
11 | endif | ||
12 | |||
13 | ifeq ($(CONFIG_ARCH_DAVINCI_DA8XX),y) | ||
14 | musb_hdrc-objs += da8xx.o | ||
15 | endif | ||
16 | |||
17 | ifeq ($(CONFIG_USB_TUSB6010),y) | ||
18 | musb_hdrc-objs += tusb6010.o | ||
19 | endif | ||
20 | |||
21 | ifeq ($(CONFIG_ARCH_OMAP2430),y) | ||
22 | musb_hdrc-objs += omap2430.o | ||
23 | endif | ||
24 | |||
25 | ifeq ($(CONFIG_ARCH_OMAP3430),y) | ||
26 | musb_hdrc-objs += omap2430.o | ||
27 | endif | ||
28 | |||
29 | ifeq ($(CONFIG_ARCH_OMAP4),y) | ||
30 | musb_hdrc-objs += omap2430.o | ||
31 | endif | ||
32 | 6 | ||
33 | ifeq ($(CONFIG_BF54x),y) | 7 | obj-$(CONFIG_USB_MUSB_HDRC) += musb_hdrc.o |
34 | musb_hdrc-objs += blackfin.o | ||
35 | endif | ||
36 | 8 | ||
37 | ifeq ($(CONFIG_BF52x),y) | 9 | musb_hdrc-y := musb_core.o |
38 | musb_hdrc-objs += blackfin.o | ||
39 | endif | ||
40 | 10 | ||
41 | ifeq ($(CONFIG_USB_GADGET_MUSB_HDRC),y) | 11 | musb_hdrc-$(CONFIG_ARCH_DAVINCI_DMx) += davinci.o |
42 | musb_hdrc-objs += musb_gadget_ep0.o musb_gadget.o | 12 | musb_hdrc-$(CONFIG_ARCH_DAVINCI_DA8XX) += da8xx.o |
43 | endif | 13 | musb_hdrc-$(CONFIG_USB_TUSB6010) += tusb6010.o |
44 | 14 | musb_hdrc-$(CONFIG_ARCH_OMAP2430) += omap2430.o | |
45 | ifeq ($(CONFIG_USB_MUSB_HDRC_HCD),y) | 15 | musb_hdrc-$(CONFIG_ARCH_OMAP3430) += omap2430.o |
46 | musb_hdrc-objs += musb_virthub.o musb_host.o | 16 | musb_hdrc-$(CONFIG_ARCH_OMAP4) += omap2430.o |
47 | endif | 17 | musb_hdrc-$(CONFIG_BF54x) += blackfin.o |
48 | 18 | musb_hdrc-$(CONFIG_BF52x) += blackfin.o | |
49 | ifeq ($(CONFIG_DEBUG_FS),y) | 19 | musb_hdrc-$(CONFIG_USB_GADGET_MUSB_HDRC) += musb_gadget_ep0.o musb_gadget.o |
50 | musb_hdrc-objs += musb_debugfs.o | 20 | musb_hdrc-$(CONFIG_USB_MUSB_HDRC_HCD) += musb_virthub.o musb_host.o |
51 | endif | 21 | musb_hdrc-$(CONFIG_DEBUG_FS) += musb_debugfs.o |
52 | 22 | ||
53 | # the kconfig must guarantee that only one of the | 23 | # the kconfig must guarantee that only one of the |
54 | # possible I/O schemes will be enabled at a time ... | 24 | # possible I/O schemes will be enabled at a time ... |
@@ -58,24 +28,17 @@ endif | |||
58 | ifneq ($(CONFIG_MUSB_PIO_ONLY),y) | 28 | ifneq ($(CONFIG_MUSB_PIO_ONLY),y) |
59 | 29 | ||
60 | ifeq ($(CONFIG_USB_INVENTRA_DMA),y) | 30 | ifeq ($(CONFIG_USB_INVENTRA_DMA),y) |
61 | musb_hdrc-objs += musbhsdma.o | 31 | musb_hdrc-y += musbhsdma.o |
62 | 32 | ||
63 | else | 33 | else |
64 | ifeq ($(CONFIG_USB_TI_CPPI_DMA),y) | 34 | ifeq ($(CONFIG_USB_TI_CPPI_DMA),y) |
65 | musb_hdrc-objs += cppi_dma.o | 35 | musb_hdrc-y += cppi_dma.o |
66 | 36 | ||
67 | else | 37 | else |
68 | ifeq ($(CONFIG_USB_TUSB_OMAP_DMA),y) | 38 | ifeq ($(CONFIG_USB_TUSB_OMAP_DMA),y) |
69 | musb_hdrc-objs += tusb6010_omap.o | 39 | musb_hdrc-y += tusb6010_omap.o |
70 | 40 | ||
71 | endif | 41 | endif |
72 | endif | 42 | endif |
73 | endif | 43 | endif |
74 | endif | 44 | endif |
75 | |||
76 | |||
77 | ################################################################################ | ||
78 | |||
79 | # Debugging | ||
80 | |||
81 | ccflags-$(CONFIG_USB_MUSB_DEBUG) := -DDEBUG | ||
diff --git a/drivers/usb/otg/Makefile b/drivers/usb/otg/Makefile index b6609db3a849..66f1b83e4fa7 100644 --- a/drivers/usb/otg/Makefile +++ b/drivers/usb/otg/Makefile | |||
@@ -2,6 +2,9 @@ | |||
2 | # OTG infrastructure and transceiver drivers | 2 | # OTG infrastructure and transceiver drivers |
3 | # | 3 | # |
4 | 4 | ||
5 | ccflags-$(CONFIG_USB_DEBUG) := -DDEBUG | ||
6 | ccflags-$(CONFIG_USB_GADGET_DEBUG) += -DDEBUG | ||
7 | |||
5 | # infrastructure | 8 | # infrastructure |
6 | obj-$(CONFIG_USB_OTG_UTILS) += otg.o | 9 | obj-$(CONFIG_USB_OTG_UTILS) += otg.o |
7 | 10 | ||
@@ -12,7 +15,3 @@ obj-$(CONFIG_TWL4030_USB) += twl4030-usb.o | |||
12 | obj-$(CONFIG_USB_LANGWELL_OTG) += langwell_otg.o | 15 | obj-$(CONFIG_USB_LANGWELL_OTG) += langwell_otg.o |
13 | obj-$(CONFIG_NOP_USB_XCEIV) += nop-usb-xceiv.o | 16 | obj-$(CONFIG_NOP_USB_XCEIV) += nop-usb-xceiv.o |
14 | obj-$(CONFIG_USB_ULPI) += ulpi.o | 17 | obj-$(CONFIG_USB_ULPI) += ulpi.o |
15 | |||
16 | ccflags-$(CONFIG_USB_DEBUG) += -DDEBUG | ||
17 | ccflags-$(CONFIG_USB_GADGET_DEBUG) += -DDEBUG | ||
18 | |||
diff --git a/drivers/usb/serial/Makefile b/drivers/usb/serial/Makefile index cf41b6209c74..9a2117f2b06e 100644 --- a/drivers/usb/serial/Makefile +++ b/drivers/usb/serial/Makefile | |||
@@ -6,10 +6,10 @@ | |||
6 | 6 | ||
7 | obj-$(CONFIG_USB_SERIAL) += usbserial.o | 7 | obj-$(CONFIG_USB_SERIAL) += usbserial.o |
8 | 8 | ||
9 | usbserial-obj-$(CONFIG_USB_SERIAL_CONSOLE) += console.o | 9 | usbserial-y := usb-serial.o generic.o bus.o |
10 | usbserial-obj-$(CONFIG_USB_EZUSB) += ezusb.o | ||
11 | 10 | ||
12 | usbserial-objs := usb-serial.o generic.o bus.o $(usbserial-obj-y) | 11 | usbserial-$(CONFIG_USB_SERIAL_CONSOLE) += console.o |
12 | usbserial-$(CONFIG_USB_EZUSB) += ezusb.o | ||
13 | 13 | ||
14 | obj-$(CONFIG_USB_SERIAL_AIRCABLE) += aircable.o | 14 | obj-$(CONFIG_USB_SERIAL_AIRCABLE) += aircable.o |
15 | obj-$(CONFIG_USB_SERIAL_ARK3116) += ark3116.o | 15 | obj-$(CONFIG_USB_SERIAL_ARK3116) += ark3116.o |
@@ -59,6 +59,5 @@ obj-$(CONFIG_USB_SERIAL_TI) += ti_usb_3410_5052.o | |||
59 | obj-$(CONFIG_USB_SERIAL_VISOR) += visor.o | 59 | obj-$(CONFIG_USB_SERIAL_VISOR) += visor.o |
60 | obj-$(CONFIG_USB_SERIAL_WHITEHEAT) += whiteheat.o | 60 | obj-$(CONFIG_USB_SERIAL_WHITEHEAT) += whiteheat.o |
61 | obj-$(CONFIG_USB_SERIAL_XIRCOM) += keyspan_pda.o | 61 | obj-$(CONFIG_USB_SERIAL_XIRCOM) += keyspan_pda.o |
62 | obj-$(CONFIG_USB_SERIAL_VIVOPAY_SERIAL) += vivopay-serial.o | 62 | obj-$(CONFIG_USB_SERIAL_VIVOPAY_SERIAL) += vivopay-serial.o |
63 | obj-$(CONFIG_USB_SERIAL_ZIO) += zio.o | 63 | obj-$(CONFIG_USB_SERIAL_ZIO) += zio.o |
64 | |||
diff --git a/drivers/usb/storage/Makefile b/drivers/usb/storage/Makefile index 65dbf652487e..fcf14cdc4a04 100644 --- a/drivers/usb/storage/Makefile +++ b/drivers/usb/storage/Makefile | |||
@@ -5,21 +5,21 @@ | |||
5 | # Rewritten to use lists instead of if-statements. | 5 | # Rewritten to use lists instead of if-statements. |
6 | # | 6 | # |
7 | 7 | ||
8 | ccflags-y := -Idrivers/scsi | 8 | ccflags-y := -Idrivers/scsi |
9 | 9 | ||
10 | obj-$(CONFIG_USB_UAS) += uas.o | 10 | obj-$(CONFIG_USB_UAS) += uas.o |
11 | obj-$(CONFIG_USB_STORAGE) += usb-storage.o | 11 | obj-$(CONFIG_USB_STORAGE) += usb-storage.o |
12 | 12 | ||
13 | usb-storage-obj-$(CONFIG_USB_STORAGE_DEBUG) += debug.o | 13 | usb-storage-y := scsiglue.o protocol.o transport.o usb.o |
14 | usb-storage-y += initializers.o sierra_ms.o option_ms.o | ||
14 | 15 | ||
15 | usb-storage-objs := scsiglue.o protocol.o transport.o usb.o \ | 16 | usb-storage-$(CONFIG_USB_STORAGE_DEBUG) += debug.o |
16 | initializers.o sierra_ms.o option_ms.o $(usb-storage-obj-y) | ||
17 | 17 | ||
18 | ifeq ($(CONFIG_USB_LIBUSUAL),) | 18 | ifeq ($(CONFIG_USB_LIBUSUAL),) |
19 | usb-storage-objs += usual-tables.o | 19 | usb-storage-y += usual-tables.o |
20 | else | 20 | else |
21 | obj-$(CONFIG_USB) += usb-libusual.o | 21 | obj-$(CONFIG_USB) += usb-libusual.o |
22 | usb-libusual-objs := libusual.o usual-tables.o | 22 | usb-libusual-y := libusual.o usual-tables.o |
23 | endif | 23 | endif |
24 | 24 | ||
25 | obj-$(CONFIG_USB_STORAGE_ALAUDA) += ums-alauda.o | 25 | obj-$(CONFIG_USB_STORAGE_ALAUDA) += ums-alauda.o |
@@ -34,14 +34,14 @@ obj-$(CONFIG_USB_STORAGE_SDDR09) += ums-sddr09.o | |||
34 | obj-$(CONFIG_USB_STORAGE_SDDR55) += ums-sddr55.o | 34 | obj-$(CONFIG_USB_STORAGE_SDDR55) += ums-sddr55.o |
35 | obj-$(CONFIG_USB_STORAGE_USBAT) += ums-usbat.o | 35 | obj-$(CONFIG_USB_STORAGE_USBAT) += ums-usbat.o |
36 | 36 | ||
37 | ums-alauda-objs := alauda.o | 37 | ums-alauda-y := alauda.o |
38 | ums-cypress-objs := cypress_atacb.o | 38 | ums-cypress-y := cypress_atacb.o |
39 | ums-datafab-objs := datafab.o | 39 | ums-datafab-y := datafab.o |
40 | ums-freecom-objs := freecom.o | 40 | ums-freecom-y := freecom.o |
41 | ums-isd200-objs := isd200.o | 41 | ums-isd200-y := isd200.o |
42 | ums-jumpshot-objs := jumpshot.o | 42 | ums-jumpshot-y := jumpshot.o |
43 | ums-karma-objs := karma.o | 43 | ums-karma-y := karma.o |
44 | ums-onetouch-objs := onetouch.o | 44 | ums-onetouch-y := onetouch.o |
45 | ums-sddr09-objs := sddr09.o | 45 | ums-sddr09-y := sddr09.o |
46 | ums-sddr55-objs := sddr55.o | 46 | ums-sddr55-y := sddr55.o |
47 | ums-usbat-objs := shuttle_usbat.o | 47 | ums-usbat-y := shuttle_usbat.o |
diff --git a/drivers/usb/wusbcore/Makefile b/drivers/usb/wusbcore/Makefile index f0d8045c802e..b3bd313032b1 100644 --- a/drivers/usb/wusbcore/Makefile +++ b/drivers/usb/wusbcore/Makefile | |||
@@ -1,9 +1,11 @@ | |||
1 | ccflags-$(CONFIG_USB_WUSB_CBAF_DEBUG) := -DDEBUG | ||
2 | |||
1 | obj-$(CONFIG_USB_WUSB) += wusbcore.o | 3 | obj-$(CONFIG_USB_WUSB) += wusbcore.o |
2 | obj-$(CONFIG_USB_HWA_HCD) += wusb-wa.o | 4 | obj-$(CONFIG_USB_HWA_HCD) += wusb-wa.o |
3 | obj-$(CONFIG_USB_WUSB_CBAF) += wusb-cbaf.o | 5 | obj-$(CONFIG_USB_WUSB_CBAF) += wusb-cbaf.o |
4 | 6 | ||
5 | 7 | ||
6 | wusbcore-objs := \ | 8 | wusbcore-y := \ |
7 | crypto.o \ | 9 | crypto.o \ |
8 | devconnect.o \ | 10 | devconnect.o \ |
9 | dev-sysfs.o \ | 11 | dev-sysfs.o \ |
@@ -14,11 +16,10 @@ wusbcore-objs := \ | |||
14 | security.o \ | 16 | security.o \ |
15 | wusbhc.o | 17 | wusbhc.o |
16 | 18 | ||
17 | wusb-cbaf-objs := cbaf.o | 19 | wusb-cbaf-y := cbaf.o |
18 | 20 | ||
19 | wusb-wa-objs := wa-hc.o \ | 21 | wusb-wa-y := \ |
20 | wa-nep.o \ | 22 | wa-hc.o \ |
21 | wa-rpipe.o \ | 23 | wa-nep.o \ |
22 | wa-xfer.o | 24 | wa-rpipe.o \ |
23 | 25 | wa-xfer.o | |
24 | ccflags-$(CONFIG_USB_WUSB_CBAF_DEBUG) := -DDEBUG | ||