summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2013-11-28 12:20:14 +0900
committerTom Rini <trini@ti.com>2013-12-13 09:18:44 -0500
commit4f57a90cfa1872c0142483e426061dca4e3c90c4 (patch)
treefdf0e35017b73b07077654ba256602201777123b
parent755e08f0e56c014c106b88b8618de2c1987f393b (diff)
downloadu-boot-imx-4f57a90cfa1872c0142483e426061dca4e3c90c4.zip
u-boot-imx-4f57a90cfa1872c0142483e426061dca4e3c90c4.tar.gz
u-boot-imx-4f57a90cfa1872c0142483e426061dca4e3c90c4.tar.bz2
drivers/usb/gadget: select objects by obj-$(CONFIG-...)
Before switching to the real Kbuild, drivers/usb/gadget/Makefile must be fixed. If none of CONFIG_USB_GADGET, CONFIG_USB_ETHER, CONFIG_USB_DEVICE is defined, both obj- and obj-y get empty. We need non-empty obj- or obj-y on each Makefile to generate built-in.o on the real Kbuild. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
-rw-r--r--drivers/usb/gadget/Makefile8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
index f52d3f4..f13b172 100644
--- a/drivers/usb/gadget/Makefile
+++ b/drivers/usb/gadget/Makefile
@@ -5,12 +5,8 @@
# SPDX-License-Identifier: GPL-2.0+
#
-# if defined(CONFIG_USB_GADGET) || defined(CONFIG_USB_ETHER)
-# Everytime you forget how crufty makefiles can get things like
-# this remind you...
-ifneq (,$(CONFIG_USB_GADGET)$(CONFIG_USB_ETHER))
-obj-y += epautoconf.o config.o usbstring.o
-endif
+obj-$(CONFIG_USB_GADGET) += epautoconf.o config.o usbstring.o
+obj-$(CONFIG_USB_ETHER) += epautoconf.o config.o usbstring.o
# new USB gadget layer dependencies
ifdef CONFIG_USB_GADGET