summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2012-09-02 16:38:48 +0200
committerWolfgang Denk <wd@denx.de>2012-09-02 16:38:48 +0200
commit7cdcaef0b286fa20926d750304442ad770a1fca8 (patch)
tree163d72e995fc25f76ab620708bfd4c3b892959cd /Makefile
parent43de0244c133b6cb9041ae6e7e4ae79839f22c44 (diff)
parent8c8650181904cee37721fa303622cd37255d51d6 (diff)
downloadblackbird-obmc-uboot-7cdcaef0b286fa20926d750304442ad770a1fca8.tar.gz
blackbird-obmc-uboot-7cdcaef0b286fa20926d750304442ad770a1fca8.zip
Merge branch 'master' of git://git.denx.de/u-boot-usb
* 'master' of git://git.denx.de/u-boot-usb: MUSB driver: Timeout is never detected as the while loop does not end usb: fix ulpi_set_vbus prototype pxa25x: Add UDC registers definitions USB: Fix strict aliasing in ohci-hcd usb: Optimize USB storage read/write ehci: Optimize qTD allocations usb_stor_BBB_transport: Do not delay when not required usb_storage: Remove EHCI constraints usb_storage: Restore non-EHCI support ehci-hcd: Boost transfer speed ehci: cosmetic: Define used constants ehci: Fail for multi-transaction interrupt transfers arm:trats: Enable g_dnl composite USB gadget with embedded DFU function on TRATS arm:trats: Support for USB UDC driver at TRATS board. dfu:cmd: Support for DFU u-boot command dfu: MMC specific routines for DFU operation dfu: DFU backend implementation dfu:usb: DFU USB function (f_dfu) support for g_dnl composite gadget dfu:usb: Support for g_dnl composite download gadget. ehci: cosmetic: Define the number of qt_buffers Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index d6d8ab2b2b..b9011c8cd9 100644
--- a/Makefile
+++ b/Makefile
@@ -269,6 +269,7 @@ LIBS-y += drivers/pci/libpci.o
LIBS-y += drivers/pcmcia/libpcmcia.o
LIBS-y += drivers/power/libpower.o
LIBS-y += drivers/spi/libspi.o
+LIBS-y += drivers/dfu/libdfu.o
ifeq ($(CPU),mpc83xx)
LIBS-y += drivers/qe/libqe.o
LIBS-y += arch/powerpc/cpu/mpc8xxx/ddr/libddr.o
OpenPOWER on IntegriCloud