From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 30C4EC77B75 for ; Sat, 6 May 2023 14:43:35 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C097985F18; Sat, 6 May 2023 16:42:56 +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=1683384176; bh=roPQw91Al5TlAZu99f3SC8L2e2MNPKNUhyxm+MVaEK0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=kSQqauIrb59kDNrYNtLFEvtXbLKJ031YBQO2opW1/fYIeg9GBk+CPM0QpcRmPLYbF Oi+gRKXjlEcq2U3wWI9NcLWCCjKpV4Ig9pVgOsZo21Y/1HE/jbdUgQKTje1wps1QjT my4179frz7p00cAKyw8TZPmXBnkyITme1VVDxFKXVJrXcyKUnFK+Zs2t/rFN+F3Xlj j2jC5yrZtf+WKDrISaFLLsQDrQ2jldq9hulPxsK1mIuEmGkccHRdO998w5/G+7zn7X suaTHK37eITpXVDKwYGT/Ij0f1r68G+DzmBIcQieNTTfmnIwdQjhg48ovBYZYvhxCz /oCW+p7GhOrkg== Received: from tr.lan (ip-86-49-120-218.bb.vodafone.cz [86.49.120.218]) (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 D42F185E7B; Sat, 6 May 2023 16:42:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1683384173; bh=roPQw91Al5TlAZu99f3SC8L2e2MNPKNUhyxm+MVaEK0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Kldphad7SODEwL9fDXl35j4mylqFltk2mLCOq+XLhbTs05CTNmk+953MUsOzzdAal YH+OIoHMM20cfqm+8QOKiCElae4m7HEUkrZ6awOfScX/Zvj0E4HWbYVXqPuCqVuO21 2SJ1uC2Jc0DdpQLF8J5XHOrYiE9mSkNFnFStmVufrZREOijUdAX5HXMtxOG6uuD3YA 9A+CiU840HJbfJBE9081d7UoRew1hjMOnnJqGTPusMp3JWd6Y2C0lBn8n0ZnqqATop YS54uwp16TupC5x3CN0qhHRO0qNCFLInrPHFAj3XO6DkC4tv9JxV2z5rRbr3FeEDd3 6QJQmd1V97EKA== From: Marek Vasut To: u-boot@lists.denx.de Cc: Marek Vasut , Andrew Davis , Chris Packham , Jim Liu , Lukasz Majewski , Samuel Holland , Simon Glass , Stefan Roese , Tom Rini , Weijie Gao Subject: [PATCH 4/4] usb: gadget: Add and use matching SPL USB ethernet gadget Kconfig symbols Date: Sat, 6 May 2023 16:42:40 +0200 Message-Id: <20230506144240.10042-4-marex@denx.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230506144240.10042-1-marex@denx.de> References: <20230506144240.10042-1-marex@denx.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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.8 at phobos.denx.de X-Virus-Status: Clean Define SPL_USB_ETH_RNDIS symbol to make it possible to select USB gadget ethernet support in SPL and U-Boot separately in Kconfig . Make use of the new symbols in gadget Makefile and move the rndis.o just below the now merged USB_ETHER symbol in Makefile. Signed-off-by: Marek Vasut --- Cc: Andrew Davis Cc: Chris Packham Cc: Jim Liu Cc: Lukasz Majewski Cc: Samuel Holland Cc: Simon Glass Cc: Stefan Roese Cc: Tom Rini Cc: Weijie Gao --- drivers/usb/gadget/Kconfig | 24 ++++++++++++++++++++++++ drivers/usb/gadget/Makefile | 3 +-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index 6f85089a9bf..1cfe6022842 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig @@ -285,6 +285,30 @@ config SPL_USB_ETHER since the network stack uses a number of environment variables. See also SPL_NET and SPL_ETH. +if SPL_USB_ETHER + +choice + prompt "USB Ethernet Gadget Model in SPL" + default SPL_USB_ETH_RNDIS + help + There is several models (protocols) to implement Ethernet over USB + devices. The main ones are Microsoft's RNDIS and USB's CDC-Ethernet + (also called CDC-ECM). RNDIS is obviously compatible with Windows, + while CDC-ECM is not. Most other operating systems support both, so + if inter-operability is a concern, RNDIS is to be preferred. + +config SPL_USB_ETH_RNDIS + bool "RNDIS Protocol" + help + The RNDIS (Remote Network Driver Interface Specification) is a + Microsoft proprietary protocol to create an Ethernet device over USB. + Windows obviously supports it, as well as all the major operating + systems, so it's the best option for compatibility. + +endchoice + +endif # SPL_USB_ETHER + config SPL_DFU bool "Support DFU (Device Firmware Upgrade) in SPL" select SPL_HASH diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile index a9edeb9f396..6abcce0d9c7 100644 --- a/drivers/usb/gadget/Makefile +++ b/drivers/usb/gadget/Makefile @@ -5,6 +5,7 @@ obj-$(CONFIG_$(SPL_TPL_)USB_GADGET) += epautoconf.o config.o usbstring.o obj-$(CONFIG_$(SPL_TPL_)USB_ETHER) += epautoconf.o config.o usbstring.o ether.o +obj-$(CONFIG_$(SPL_TPL_)USB_ETH_RNDIS) += rndis.o ifdef CONFIG_SPL_BUILD obj-$(CONFIG_SPL_USB_GADGET) += g_dnl.o @@ -34,8 +35,6 @@ endif obj-$(CONFIG_CI_UDC) += ci_udc.o -obj-$(CONFIG_USB_ETH_RNDIS) += rndis.o - # Devices not related to the new gadget layer depend on CONFIG_USB_DEVICE # This is really only N900 and USBTTY now. obj-$(CONFIG_USB_DEVICE) += core.o ep0.o -- 2.39.2