projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-nios
[platform/kernel/u-boot.git]
/
drivers
/
usb
/
host
/
Makefile
diff --git
a/drivers/usb/host/Makefile
b/drivers/usb/host/Makefile
index
ec1d689
..
09abb75
100644
(file)
--- a/
drivers/usb/host/Makefile
+++ b/
drivers/usb/host/Makefile
@@
-23,7
+23,7
@@
include $(TOPDIR)/config.mk
include $(TOPDIR)/config.mk
-LIB := $(obj)libusb_host.
a
+LIB := $(obj)libusb_host.
o
# ohci
COBJS-$(CONFIG_USB_OHCI_NEW) += ohci-hcd.o
# ohci
COBJS-$(CONFIG_USB_OHCI_NEW) += ohci-hcd.o
@@
-35,8
+35,16
@@
COBJS-$(CONFIG_USB_SL811HS) += sl811-hcd.o
# echi
COBJS-$(CONFIG_USB_EHCI) += ehci-hcd.o
# echi
COBJS-$(CONFIG_USB_EHCI) += ehci-hcd.o
+ifdef CONFIG_MPC512X
+COBJS-$(CONFIG_USB_EHCI_FSL) += ehci-mpc512x.o
+else
COBJS-$(CONFIG_USB_EHCI_FSL) += ehci-fsl.o
COBJS-$(CONFIG_USB_EHCI_FSL) += ehci-fsl.o
+endif
+COBJS-$(CONFIG_USB_EHCI_MXC) += ehci-mxc.o
+COBJS-$(CONFIG_USB_EHCI_MXS) += ehci-mxs.o
+COBJS-$(CONFIG_USB_EHCI_PPC4XX) += ehci-ppc4xx.o
COBJS-$(CONFIG_USB_EHCI_IXP4XX) += ehci-ixp.o
COBJS-$(CONFIG_USB_EHCI_IXP4XX) += ehci-ixp.o
+COBJS-$(CONFIG_USB_EHCI_KIRKWOOD) += ehci-kirkwood.o
COBJS-$(CONFIG_USB_EHCI_PCI) += ehci-pci.o
COBJS-$(CONFIG_USB_EHCI_VCT) += ehci-vct.o
COBJS-$(CONFIG_USB_EHCI_PCI) += ehci-pci.o
COBJS-$(CONFIG_USB_EHCI_VCT) += ehci-vct.o
@@
-47,7
+55,7
@@
OBJS := $(addprefix $(obj),$(COBJS))
all: $(LIB)
$(LIB): $(obj).depend $(OBJS)
all: $(LIB)
$(LIB): $(obj).depend $(OBJS)
- $(
AR) $(ARFLAGS) $@ $(OBJS
)
+ $(
call cmd_link_o_target, $(OBJS)
)
#########################################################################
#########################################################################