From patchwork Tue Sep 12 19:01:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 112377 Delivered-To: patch@linaro.org Received: by 10.80.202.13 with SMTP id d13csp26630edi; Tue, 12 Sep 2017 12:09:18 -0700 (PDT) X-Google-Smtp-Source: ADKCNb4P57p+31edG5viAcALyIEMgtP3PJcUWYMj8hH1D8vVKYVKVY+bB5sJtbm9vMpUk1BJ3+c1 X-Received: by 10.80.213.26 with SMTP id u26mr12901410edi.87.1505243249501; Tue, 12 Sep 2017 12:07:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505243249; cv=none; d=google.com; s=arc-20160816; b=ksObq/yzyGOwqEz7eBucRxEs/CmFCRWDLXoCXmwkGJi1N0T9DIM2NyZSRIyTQ8FCZM HWW+CalG8ToWecA4ewydg+MQwBBjgY4yF3Y7xRS+UX+zynoN2KA24+54d0q5KCPpzx71 DR6yOFWuXy5PGPWATP+pz8/Cz13WC/E8BEdaaRasEWqglpU0KpAbJU/imIvqVWucLVRj RQm4yRRisUNBBTSvZuAm/VVb4Uv0aNQylOaU7jygPNh+Wzoc6tapwRQGRBFzaHXSoKrQ MlVE6KYUfp6ALNT0+IN66wz+L4Ba6Ha//BZ4tKCp1isM8R5KKBewJ9ryagi3qNf7ZQWv Dqsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:references :in-reply-to:message-id:date:to:from:arc-authentication-results; bh=hnDK09XXHVbMw5WS8FZHMfFCs/BScDifkMCXpHJAIHI=; b=dFy5zy3pCcAJXYKkk/DzeSRFYPY091HX1M3HLBPzSPIDSuosvQ6M2vdGiRWY/egYxO Sa/2UuaVfP8sfMCWw80nY1PE8BFhNxX8Y+HoNdMISo3oFcPy3PaqEahxssnDF91Pq8Me uzAKPnGV05UOR7hLzNyN8MSg+dvGeMvECR/WysfQq9rPfKccs8+BMsLpcprUsUDE7tNP 6prdDOXa4GjUQhEMeS0R2TwOwKfkH8gucp6h168ofpVCoFCSkr5UGUg6bAgRLa51ZFnb pSe8vFQtX0Hak2cs0bGz7lNoL/ZQ77vkVy9LGcL3iEfeJUHfvbp2kBDBjEsPHuNjwoIg h9SA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id k7si2789793edj.304.2017.09.12.12.07.29; Tue, 12 Sep 2017 12:07:29 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by lists.denx.de (Postfix, from userid 105) id E3248C21FF5; Tue, 12 Sep 2017 19:05:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 4C36CC21FE6; Tue, 12 Sep 2017 19:02:01 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id DACB4C22167; Tue, 12 Sep 2017 19:01:53 +0000 (UTC) Received: from mail.free-electrons.com (mail.free-electrons.com [62.4.15.54]) by lists.denx.de (Postfix) with ESMTP id A6033C21FB0 for ; Tue, 12 Sep 2017 19:01:48 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 110) id 7700C2098D; Tue, 12 Sep 2017 21:01:48 +0200 (CEST) Received: from localhost (LFbn-TOU-1-209-191.w86-201.abo.wanadoo.fr [86.201.56.191]) by mail.free-electrons.com (Postfix) with ESMTPSA id 459232091D; Tue, 12 Sep 2017 21:01:48 +0200 (CEST) From: Maxime Ripard To: Tom Rini , Jagan Teki Date: Tue, 12 Sep 2017 21:01:31 +0200 Message-Id: X-Mailer: git-send-email 2.13.5 In-Reply-To: References: In-Reply-To: References: Cc: Thomas Petazzoni , marex@denx.de, u-boot@lists.denx.de, Maxime Ripard Subject: [U-Boot] [PATCH v2 03/14] usb: gadget: Move USBNET_HOST_ADDR to Kconfig X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" While the USB Ethernet device address is already defined in Kconfig, the host address isn't. Convert it. Signed-off-by: Maxime Ripard Reviewed-by: Simon Glass Reviewed-by: Łukasz Majewski --- configs/am335x_baltos_defconfig | 1 + configs/am335x_boneblack_defconfig | 1 + configs/am335x_evm_norboot_defconfig | 1 + configs/pxm2_defconfig | 1 + configs/rastaban_defconfig | 1 + configs/warp7_defconfig | 1 + configs/warp7_secure_defconfig | 1 + drivers/usb/gadget/Kconfig | 7 +++++++ include/configs/am335x_evm.h | 1 - include/configs/baltos.h | 1 - include/configs/h2200.h | 1 - include/configs/siemens-am33x-common.h | 1 - include/configs/warp7.h | 1 - scripts/config_whitelist.txt | 1 - 14 files changed, 14 insertions(+), 6 deletions(-) diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig index eb8338f0f10d..be057acf8634 100644 --- a/configs/am335x_baltos_defconfig +++ b/configs/am335x_baltos_defconfig @@ -63,5 +63,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_G_DNL_MANUFACTURER="Texas Instruments" CONFIG_G_DNL_VENDOR_NUM=0x0403 CONFIG_G_DNL_PRODUCT_NUM=0xbd00 +CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00" CONFIG_FAT_WRITE=y CONFIG_OF_LIBFDT=y diff --git a/configs/am335x_boneblack_defconfig b/configs/am335x_boneblack_defconfig index b8526fc15ed3..719d16b145eb 100644 --- a/configs/am335x_boneblack_defconfig +++ b/configs/am335x_boneblack_defconfig @@ -42,6 +42,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_G_DNL_MANUFACTURER="Texas Instruments" CONFIG_G_DNL_VENDOR_NUM=0x0451 CONFIG_G_DNL_PRODUCT_NUM=0xd022 +CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00" CONFIG_LZO=y CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT_OVERLAY=y diff --git a/configs/am335x_evm_norboot_defconfig b/configs/am335x_evm_norboot_defconfig index c5e7425a7797..c9eab68c8299 100644 --- a/configs/am335x_evm_norboot_defconfig +++ b/configs/am335x_evm_norboot_defconfig @@ -35,6 +35,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_G_DNL_MANUFACTURER="Texas Instruments" CONFIG_G_DNL_VENDOR_NUM=0x0451 CONFIG_G_DNL_PRODUCT_NUM=0xd022 +CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00" CONFIG_LZO=y CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT_OVERLAY=y diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig index 38370ee8d8f5..b1da71d4c7ed 100644 --- a/configs/pxm2_defconfig +++ b/configs/pxm2_defconfig @@ -74,6 +74,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_G_DNL_MANUFACTURER="Siemens AG" CONFIG_G_DNL_VENDOR_NUM=0x0908 CONFIG_G_DNL_PRODUCT_NUM=0x02d2 +CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00" # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_SYS_CONSOLE_BG_COL=0xff CONFIG_SYS_CONSOLE_FG_COL=0x00 diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig index 5acfe22b0a6d..940c4144d406 100644 --- a/configs/rastaban_defconfig +++ b/configs/rastaban_defconfig @@ -70,3 +70,4 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_G_DNL_MANUFACTURER="Siemens AG" CONFIG_G_DNL_VENDOR_NUM=0x0908 CONFIG_G_DNL_PRODUCT_NUM=0x02d2 +CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00" diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig index 99fe800317c2..f430f30bbbe5 100644 --- a/configs/warp7_defconfig +++ b/configs/warp7_defconfig @@ -38,4 +38,5 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_G_DNL_MANUFACTURER="FSL" CONFIG_G_DNL_VENDOR_NUM=0x0525 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 +CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00" CONFIG_OF_LIBFDT=y diff --git a/configs/warp7_secure_defconfig b/configs/warp7_secure_defconfig index 8beda72cd882..96e2c9e5cfde 100644 --- a/configs/warp7_secure_defconfig +++ b/configs/warp7_secure_defconfig @@ -36,4 +36,5 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_G_DNL_MANUFACTURER="FSL" CONFIG_G_DNL_VENDOR_NUM=0x0525 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 +CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00" CONFIG_OF_LIBFDT=y diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index 6dc9d177f5ad..510efd67b9a4 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig @@ -128,4 +128,11 @@ config USBNET_DEVADDR Ethernet MAC address of the device-side (ie. local board's) MAC address of the usb_ether interface +config USBNET_HOST_ADDR + string "USB Gadget Ethernet host mac address" + default "de:ad:be:ef:00:00" + help + Ethernet MAC address of the host-side (ie. remote device's) MAC + address of the usb_ether interface + endif # USB_GADGET diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 415ce46e0d8d..7c025c7e46c8 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -266,7 +266,6 @@ #ifdef CONFIG_USB_MUSB_GADGET #define CONFIG_USB_ETHER #define CONFIG_USB_ETH_RNDIS -#define CONFIG_USBNET_HOST_ADDR "de:ad:be:af:00:00" #endif /* CONFIG_USB_MUSB_GADGET */ /* diff --git a/include/configs/baltos.h b/include/configs/baltos.h index 185c749d7868..535fdd4373b0 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -286,7 +286,6 @@ #ifdef CONFIG_USB_MUSB_GADGET #define CONFIG_USB_ETHER #define CONFIG_USB_ETH_RNDIS -#define CONFIG_USBNET_HOST_ADDR "de:ad:be:af:00:00" #endif /* CONFIG_USB_MUSB_GADGET */ #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT) diff --git a/include/configs/h2200.h b/include/configs/h2200.h index 870014ddf475..e956e89a89d5 100644 --- a/include/configs/h2200.h +++ b/include/configs/h2200.h @@ -127,7 +127,6 @@ #define CONFIG_USB_ETH_SUBSET #define CONFIG_USBNET_DEV_ADDR "de:ad:be:ef:00:01" -#define CONFIG_USBNET_HOST_ADDR "de:ad:be:ef:00:02" #define CONFIG_EXTRA_ENV_SETTINGS \ "stdin=serial\0" \ "stdout=serial\0" \ diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 2314a2d2ef35..2bcd77e9efc8 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -181,7 +181,6 @@ #ifdef CONFIG_USB_MUSB_GADGET #define CONFIG_USB_ETHER #define CONFIG_USB_ETH_RNDIS -#define CONFIG_USBNET_HOST_ADDR "de:ad:be:af:00:00" #endif /* CONFIG_USB_MUSB_GADGET */ /* USB DRACO ID as default */ diff --git a/include/configs/warp7.h b/include/configs/warp7.h index 75ae8a3e3338..9ce425156677 100644 --- a/include/configs/warp7.h +++ b/include/configs/warp7.h @@ -139,7 +139,6 @@ #define CONFIG_USB_ETHER #define CONFIG_USB_ETH_CDC #define CONFIG_USB_ETH_RNDIS -#define CONFIG_USBNET_HOST_ADDR "de:ad:be:af:00:00" #define CONFIG_USBNET_DEV_ADDR "de:ad:be:af:00:01" #endif diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 9ce0c3f039ff..784e83c7c8a1 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -4983,7 +4983,6 @@ CONFIG_USBD_SERIAL_OUT_PKTSIZE CONFIG_USBD_VENDORID CONFIG_USBID_ADDR CONFIG_USBNET_DEV_ADDR -CONFIG_USBNET_HOST_ADDR CONFIG_USBNET_MANUFACTURER CONFIG_USBTTY CONFIG_USB_AM35X