From patchwork Tue Aug 23 17:06:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1669379 X-Patchwork-Delegate: marek.vasut@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=XxnkJIHU; dkim=pass (2048-bit key) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=xpv509M3; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4MBwd6479Gz1ygF for ; Wed, 24 Aug 2022 03:07:06 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3325E84540; Tue, 23 Aug 2022 19:07:03 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1661274423; bh=SdTjQayEoirzY1jvC1Elr6iGAn3SPu7FfM1R4Vt1ieo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=XxnkJIHUZqVft/3t/CMwBbMEMNSgDBw2bkQxqIEmlzCNnjPAdq7mIUh+x3DQsj9IT 1bpVH9bNYz8ereZhF2Ql4yPZzsjdtVmrCMuI46Ykp2LC8oo+w/3bZnT32gz3rZqSBC 1XncBT9eEvpx2jsZad4FbaxUsjwpTZ9dhgH+N3OA3BtW2VsyUwpb24v9Db3MIcJ8Cq w5WY5Z6/SPn6YkeQ3hLUf8ibBxWvN8Ue+asp2tQOnCPmG35LQg4tgkPqL2W7277XHz +t5NIr1wp5Iq1bvw9OKFQS1kKsArFYifIC0XHdIGCzz3Mpgp/1TrY37j5+lTh5Ui65 kKz6/FEGO67nA== Received: from tr.lan (ip-86-49-12-201.bb.vodafone.cz [86.49.12.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id B8F1484540; Tue, 23 Aug 2022 19:07:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1661274422; bh=SdTjQayEoirzY1jvC1Elr6iGAn3SPu7FfM1R4Vt1ieo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xpv509M3gVvhjTZ5jH3DrLp0qERn6/2d20JHUnamcJ6gKmngfu3ue00O+sNqtvq0K Aa0AWZ3Jh50JmYfXpBemVwvtfC5V4dbXNtxoy9mkfx64Bwzi2f9GtaD0mD9Gf8RcsD OvbZ2oQVY97XIFsqaWTapbY95IB+/SUSTZRQYD5fanyVbd6S0Hjjheub0uNQkGGml5 VdmDJXgjdQ0F65GN6MKGyu+8wnZvUvDBaJfSw1HN2+MZweAqAI8OUeHUWZq9p13bnZ tikSGjdYTSSSGS+gGafWdgO38jYLnmsf0zBg3oIvtBMswyKK/GuV5l075QT5dsMWC3 PnrBsaWahYxQg== From: Marek Vasut To: u-boot@lists.denx.de Cc: Marek Vasut , Heiko Schocher , Patrice Chotard , Patrick Delaunay Subject: [PATCH 2/2] usb: gadget: Clean up Makefile ifdeffery Date: Tue, 23 Aug 2022 19:06:51 +0200 Message-Id: <20220823170651.302644-2-marex@denx.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220823170651.302644-1-marex@denx.de> References: <20220823170651.302644-1-marex@denx.de> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean Take the USB_ETHER ifdef block apart and make use of obj-$(VAR) instead to include the source files in build. The duplicate CI_UDC entry is now removed, the USB_DEVICE ifdef is now reduced to core.o ep.o addition, the ether.o can be conditionally compiled in using USB_ETHER. No functional change. Signed-off-by: Marek Vasut Reviewed-by: Patrice Chotard --- Cc: Heiko Schocher Cc: Patrice Chotard Cc: Patrick Delaunay --- drivers/usb/gadget/Makefile | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile index dd09ee01959..9c04403da30 100644 --- a/drivers/usb/gadget/Makefile +++ b/drivers/usb/gadget/Makefile @@ -21,7 +21,6 @@ obj-$(CONFIG_USB_GADGET_DWC2_OTG) += dwc2_udc_otg.o obj-$(CONFIG_USB_GADGET_DWC2_OTG_PHY) += dwc2_udc_otg_phy.o obj-$(CONFIG_USB_GADGET_FOTG210) += fotg210.o obj-$(CONFIG_USB_GADGET_MAX3420) += max3420_udc.o -obj-$(CONFIG_CI_UDC) += ci_udc.o ifndef CONFIG_SPL_BUILD obj-$(CONFIG_USB_GADGET_DOWNLOAD) += g_dnl.o obj-$(CONFIG_USB_FUNCTION_THOR) += f_thor.o @@ -33,14 +32,12 @@ obj-$(CONFIG_USB_FUNCTION_ROCKUSB) += f_rockusb.o obj-$(CONFIG_USB_FUNCTION_ACM) += f_acm.o endif endif -ifdef CONFIG_USB_ETHER -obj-y += ether.o + +obj-$(CONFIG_CI_UDC) += ci_udc.o + +obj-$(CONFIG_USB_ETHER) += ether.o obj-$(CONFIG_USB_ETH_RNDIS) += rndis.o -obj-$(CONFIG_CI_UDC) += ci_udc.o -else + # Devices not related to the new gadget layer depend on CONFIG_USB_DEVICE -ifdef CONFIG_USB_DEVICE -obj-y += core.o -obj-y += ep0.o -endif -endif +# This is really only N900 and USBTTY now. +obj-$(CONFIG_USB_DEVICE) += core.o ep0.o