USB: Build USB init code based on config entry, clean-up Makefile

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / Makefile

diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 631166d44cb481f6099a3582f67ca1dacb7221a1..b44bb788cd29cd03a1a4abf5b9ec807a245bf259 100644 (file)
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -43,28 +43,21 @@ obj-$(CONFIG_MACH_OMAP_GENERIC)             += board-generic.o
 obj-$(CONFIG_MACH_OMAP_H4)             += board-h4.o board-h4-mmc.o
 obj-$(CONFIG_MACH_OMAP_2430SDP)                += board-2430sdp.o \
                                           board-2430sdp-flash.o \
-                                          mmc-twl4030.o \
-                                          usb-musb.o \
-                                          usb-ehci.o
+                                          mmc-twl4030.o
 obj-$(CONFIG_MACH_OMAP2EVM)            += board-omap2evm.o \
                                           mmc-twl4030.o
 obj-$(CONFIG_MACH_OMAP_3430SDP)                += board-3430sdp.o \
                                           mmc-twl4030.o \
-                                          usb-musb.o \
-                                          usb-ehci.o \
                                           board-3430sdp-flash.o
 obj-$(CONFIG_MACH_OMAP3EVM)            += board-omap3evm.o \
                                           mmc-twl4030.o \
-                                          usb-musb.o usb-ehci.o \
                                           board-omap3evm-flash.o \
                                           twl4030-generic-scripts.o
 obj-$(CONFIG_MACH_OMAP3_BEAGLE)                += board-omap3beagle.o \
-                                          usb-musb.o usb-ehci.o \
                                           mmc-twl4030.o \
                                           twl4030-generic-scripts.o
 obj-$(CONFIG_MACH_OMAP_LDP)            += board-ldp.o \
-                                          mmc-twl4030.o \
-                                          usb-musb.o
+                                          mmc-twl4030.o
 obj-$(CONFIG_MACH_OMAP_APOLLON)                += board-apollon.o \
                                           board-apollon-mmc.o  \
                                           board-apollon-keys.o
@@ -80,19 +73,20 @@ obj-$(CONFIG_MACH_NOKIA_RX51)               += board-rx51.o \
                                           board-rx51-sdram.o \
                                           board-rx51-video.o \
                                           board-rx51-peripherals.o \
-                                          mmc-twl4030.o \
-                                          usb-musb.o
+                                          mmc-twl4030.o
 
 obj-$(CONFIG_MACH_OVERO)               += board-overo.o \
                                           mmc-twl4030.o \
-                                          usb-musb.o \
-                                          usb-ehci.o \
                                           twl4030-generic-scripts.o
 obj-$(CONFIG_MACH_OMAP3_PANDORA)       += board-omap3pandora.o \
-                                          mmc-twl4030.o \
-                                          usb-musb.o \
-                                          usb-ehci.o
+                                          mmc-twl4030.o
 
-# TUSB 6010 chips
+# Platform specific device init code
+obj-$(CONFIG_USB_MUSB_SOC)             += usb-musb.o
 obj-$(CONFIG_MACH_OMAP2_TUSB6010)      += usb-tusb6010.o
 
+ifneq ($(CONFIG_USB_EHCI_HCD),)
+       obj-y                           += usb-ehci.o
+endif
+
+