From: Tom Rini <trini@konsulko.com>
Date: Tue, 27 Sep 2016 12:36:56 +0000 (-0400)
Subject: usb:gadget: Disallow DFU in SPL for now
X-Git-Tag: v2016.11-rc1~38
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6ad6102246d83ec1d39aeba83f66cf5faffd0f82;p=oweals%2Fu-boot.git

usb:gadget: Disallow DFU in SPL for now

Previously, DFU was not built in for SPL and often disabled via the board
config.h file, in the SPL build.  By moving DFU to Kconfig we now need to
move this logic to the Makefile to continue to allow boards to fit within
their SPL size limit (until gcc 6 is more widespread and unused strings will
be discarded).

Signed-off-by: Tom Rini <trini@konsulko.com>
---

diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
index c915c79729..acc9964e23 100644
--- a/drivers/usb/gadget/Makefile
+++ b/drivers/usb/gadget/Makefile
@@ -19,7 +19,9 @@ obj-$(CONFIG_USB_GADGET_FOTG210) += fotg210.o
 obj-$(CONFIG_CI_UDC)	+= ci_udc.o
 obj-$(CONFIG_USB_GADGET_DOWNLOAD) += g_dnl.o
 obj-$(CONFIG_USB_FUNCTION_THOR) += f_thor.o
+ifndef CONFIG_SPL_BUILD
 obj-$(CONFIG_USB_FUNCTION_DFU) += f_dfu.o
+endif
 obj-$(CONFIG_USB_FUNCTION_MASS_STORAGE) += f_mass_storage.o
 obj-$(CONFIG_USB_FUNCTION_FASTBOOT) += f_fastboot.o
 endif