On Mon, 27 Jan 2020 at 22:51, Lukasz Majewski <lu...@denx.de> wrote: > > Hi Nathan, > > > Handle selection of objects based on $(SPL_) to allow for normal and > > SPL builds to have differing object compilation. > > Could you share the exact use case? I do guess that you want to add > some gadget(s) to SPL?
I am primarily trying to disable SPL_ENV_SUPPORT for beaglebone (am335x_evm). SPL_USB_ETHER has a dependency on SPL_ENV_SUPPORT, thus the desire to disable it (whilst leaving SPL_USB_GADGET enabled). > > (Such changes may cause issues on boards already using this feature - > could you run: > > ./tools/buildman/buildman.py --branch=HEAD siemens samsung bbb > --detail --verbose --show_errors --force-build --count=1 > --output-dir=./BUILD/ Running this showed no regressions. Also I noticed "bbb" does not refer to any boards? Thanks, Nathan > > > > > > > Signed-off-by: Nathan Rossi <nat...@nathanrossi.com> > > --- > > drivers/usb/gadget/Makefile | 8 ++++---- > > 1 file changed, 4 insertions(+), 4 deletions(-) > > > > diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile > > index 70f3bf43e7..8967745513 100644 > > --- a/drivers/usb/gadget/Makefile > > +++ b/drivers/usb/gadget/Makefile > > @@ -3,8 +3,8 @@ > > # (C) Copyright 2000-2007 > > # Wolfgang Denk, DENX Software Engineering, w...@denx.de. > > > > -obj-$(CONFIG_USB_GADGET) += epautoconf.o config.o usbstring.o > > -obj-$(CONFIG_USB_ETHER) += epautoconf.o config.o usbstring.o > > +obj-$(CONFIG_$(SPL_)USB_GADGET) += epautoconf.o config.o usbstring.o > > +obj-$(CONFIG_$(SPL_)USB_ETHER) += epautoconf.o config.o usbstring.o > > > > ifdef CONFIG_SPL_BUILD > > obj-$(CONFIG_SPL_USB_GADGET) += g_dnl.o > > @@ -13,7 +13,7 @@ obj-$(CONFIG_SPL_USB_SDP_SUPPORT) += f_sdp.o > > endif > > > > # new USB gadget layer dependencies > > -ifdef CONFIG_USB_GADGET > > +ifdef CONFIG_$(SPL_)USB_GADGET > > obj-$(CONFIG_USB_GADGET_AT91) += at91_udc.o > > obj-$(CONFIG_USB_GADGET_ATMEL_USBA) += atmel_usba_udc.o > > obj-$(CONFIG_USB_GADGET_BCM_UDC_OTG_PHY) += bcm_udc_otg_phy.o > > @@ -31,7 +31,7 @@ obj-$(CONFIG_USB_FUNCTION_SDP) += f_sdp.o > > obj-$(CONFIG_USB_FUNCTION_ROCKUSB) += f_rockusb.o > > endif > > endif > > -ifdef CONFIG_USB_ETHER > > +ifdef CONFIG_$(SPL_)USB_ETHER > > obj-y += ether.o > > obj-$(CONFIG_USB_ETH_RNDIS) += rndis.o > > obj-$(CONFIG_CI_UDC) += ci_udc.o > > --- > > 2.24.1 > > > > > Best regards, > > Lukasz Majewski > > -- > > DENX Software Engineering GmbH, Managing Director: Wolfgang Denk > HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany > Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lu...@denx.de
