[PATCH] usb: gadget: Compile USB ethernet gadget only if NET is enabled

[Tom Rini]

On Mon, May 01, 2023 at 07:40:57PM +0200, Marek Vasut wrote:
> On 5/1/23 19:23, Tom Rini wrote:
> > On Mon, May 01, 2023 at 06:53:52PM +0200, Marek Vasut wrote:
> > > On 5/1/23 15:47, Tom Rini wrote:
> > > > On Sun, Apr 30, 2023 at 11:20:35PM +0200, Marek Vasut wrote:
> > > > 
> > > > > In case NET networking is not enabled, it is not possible to compile
> > > > > the USB ethernet gadget. Protect the symbols in Makefile to avoid build
> > > > > failure. Such build failure may occur e.g. in case NET and USB ethernet
> > > > > gadget is enabled in U-Boot proper, but not in SPL.
> > > > > 
> > > > > Signed-off-by: Marek Vasut <marex at denx.de>
> > > > > ---
> > > > > Cc: Lukasz Majewski <lukma at denx.de>
> > > > > ---
> > > > >    drivers/usb/gadget/Makefile | 2 ++
> > > > >    1 file changed, 2 insertions(+)
> > > > > 
> > > > > diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
> > > > > index 6cfe0f3a041..36f65e7eb95 100644
> > > > > --- a/drivers/usb/gadget/Makefile
> > > > > +++ b/drivers/usb/gadget/Makefile
> > > > > @@ -34,8 +34,10 @@ endif
> > > > >    obj-$(CONFIG_CI_UDC) += ci_udc.o
> > > > > +ifeq ($(CONFIG_$(SPL_TPL_)NET),y)
> > > > >    obj-$(CONFIG_USB_ETHER) += ether.o
> > > > >    obj-$(CONFIG_USB_ETH_RNDIS) += rndis.o
> > > > > +endif
> > > > >    # Devices not related to the new gadget layer depend on CONFIG_USB_DEVICE
> > > > >    # This is really only N900 and USBTTY now.
> > > > 
> > > > Why can't we just enforce this via Kconfig?
> > > 
> > > Because there is no SPL/TPL USB_ETHER Kconfig .
> > > Do we want to grow the Kconfig file with those instead ?
> > 
> > Ah right.  Yes, we have SPL_USB_ETHER today
> 
> This is exactly the opposite of what I wrote.
> 
> And no, we do NOT have this symbol, see:
> 
> $ git grep SPL_USB_ETHER drivers/usb | wc -l
> 0

Yes, it resides in common/spl/Kconfig

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20230501/e348d818/attachment.sig>