Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/811712/?format=api
{ "id": 811712, "url": "http://patchwork.ozlabs.org/api/patches/811712/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/patch/e7be1c87c0275f3b89fa030a70d550807e28fe65.1504891631.git-series.maxime.ripard@free-electrons.com/", "project": { "id": 18, "url": "http://patchwork.ozlabs.org/api/projects/18/?format=api", "name": "U-Boot", "link_name": "uboot", "list_id": "u-boot.lists.denx.de", "list_email": "u-boot@lists.denx.de", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<e7be1c87c0275f3b89fa030a70d550807e28fe65.1504891631.git-series.maxime.ripard@free-electrons.com>", "list_archive_url": null, "date": "2017-09-08T17:34:15", "name": "[U-Boot,04/13] usb: gadget: usb_ether: Move the interfaces to Kconfig", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "c4ee51948173ecb2791e519784259e489af8cc1d", "submitter": { "id": 12916, "url": "http://patchwork.ozlabs.org/api/people/12916/?format=api", "name": "Maxime Ripard", "email": "maxime.ripard@free-electrons.com" }, "delegate": { "id": 68827, "url": "http://patchwork.ozlabs.org/api/users/68827/?format=api", "username": "lukma", "first_name": "Lukasz", "last_name": "Majewski", "email": "lukma@denx.de" }, "mbox": "http://patchwork.ozlabs.org/project/uboot/patch/e7be1c87c0275f3b89fa030a70d550807e28fe65.1504891631.git-series.maxime.ripard@free-electrons.com/mbox/", "series": [ { "id": 2256, "url": "http://patchwork.ozlabs.org/api/series/2256/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/list/?series=2256", "date": "2017-09-08T17:34:11", "name": "sunxi: convert musb to the device model and enable usb_ether", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/2256/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/811712/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/811712/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<u-boot-bounces@lists.denx.de>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@bilbo.ozlabs.org", "Authentication-Results": "ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=lists.denx.de\n\t(client-ip=81.169.180.215; helo=lists.denx.de;\n\tenvelope-from=u-boot-bounces@lists.denx.de;\n\treceiver=<UNKNOWN>)", "Received": [ "from lists.denx.de (dione.denx.de [81.169.180.215])\n\tby ozlabs.org (Postfix) with ESMTP id 3xpl2T1Rgvz9s8J\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 9 Sep 2017 03:40:00 +1000 (AEST)", "by lists.denx.de (Postfix, from userid 105)\n\tid 64023C21F27; Fri, 8 Sep 2017 17:37:30 +0000 (UTC)", "from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id 1F1B6C21F2B;\n\tFri, 8 Sep 2017 17:34:41 +0000 (UTC)", "by lists.denx.de (Postfix, from userid 105)\n\tid 391FEC21CA5; Fri, 8 Sep 2017 17:34:33 +0000 (UTC)", "from mail.free-electrons.com (mail.free-electrons.com [62.4.15.54])\n\tby lists.denx.de (Postfix) with ESMTP id D9DB5C21C93\n\tfor <u-boot@lists.denx.de>; Fri, 8 Sep 2017 17:34:32 +0000 (UTC)", "by mail.free-electrons.com (Postfix, from userid 110)\n\tid 5CDCF21D2F; Fri, 8 Sep 2017 19:34:31 +0200 (CEST)", "from localhost (LFbn-TOU-1-209-191.w86-201.abo.wanadoo.fr\n\t[86.201.56.191])\n\tby mail.free-electrons.com (Postfix) with ESMTPSA id 2933320882;\n\tFri, 8 Sep 2017 19:34:31 +0200 (CEST)" ], "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\n\tautolearn_force=no version=3.4.0", "From": "Maxime Ripard <maxime.ripard@free-electrons.com>", "To": "Tom Rini <trini@konsulko.com>,\n\tJagan Teki <jagan@openedev.com>", "Date": "Fri, 8 Sep 2017 19:34:15 +0200", "Message-Id": "<e7be1c87c0275f3b89fa030a70d550807e28fe65.1504891631.git-series.maxime.ripard@free-electrons.com>", "X-Mailer": "git-send-email 2.13.5", "In-Reply-To": [ "<cover.3b9463250a55d25afdf3b221b80a90b4e7811c1e.1504891631.git-series.maxime.ripard@free-electrons.com>", "<cover.3b9463250a55d25afdf3b221b80a90b4e7811c1e.1504891631.git-series.maxime.ripard@free-electrons.com>" ], "References": [ "<cover.3b9463250a55d25afdf3b221b80a90b4e7811c1e.1504891631.git-series.maxime.ripard@free-electrons.com>", "<cover.3b9463250a55d25afdf3b221b80a90b4e7811c1e.1504891631.git-series.maxime.ripard@free-electrons.com>" ], "Cc": "Thomas Petazzoni <thomas.petazzoni@free-electrons.com>, marex@denx.de,\n\tu-boot@lists.denx.de, Maxime Ripard <maxime.ripard@free-electrons.com>", "Subject": "[U-Boot] [PATCH 04/13] usb: gadget: usb_ether: Move the interfaces\n\tto Kconfig", "X-BeenThere": "u-boot@lists.denx.de", "X-Mailman-Version": "2.1.18", "Precedence": "list", "List-Id": "U-Boot discussion <u-boot.lists.denx.de>", "List-Unsubscribe": "<https://lists.denx.de/options/u-boot>,\n\t<mailto:u-boot-request@lists.denx.de?subject=unsubscribe>", "List-Archive": "<http://lists.denx.de/pipermail/u-boot/>", "List-Post": "<mailto:u-boot@lists.denx.de>", "List-Help": "<mailto:u-boot-request@lists.denx.de?subject=help>", "List-Subscribe": "<https://lists.denx.de/listinfo/u-boot>,\n\t<mailto:u-boot-request@lists.denx.de?subject=subscribe>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "base64", "Errors-To": "u-boot-bounces@lists.denx.de", "Sender": "\"U-Boot\" <u-boot-bounces@lists.denx.de>" }, "content": "We need to select an interface for the usb_ether gadget, and they haven't\nbeen converted to Kconfig yet. Add a choice to make sure we have an option\nselected, and convert all the users.\n\nSigned-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>\n---\n configs/gwventana_emmc_defconfig | 1 +\n configs/gwventana_gw5904_defconfig | 1 +\n configs/gwventana_nand_defconfig | 1 +\n configs/mx6qsabrelite_defconfig | 1 +\n configs/nitrogen6dl2g_defconfig | 1 +\n configs/nitrogen6dl_defconfig | 1 +\n configs/nitrogen6q2g_defconfig | 1 +\n configs/nitrogen6q_defconfig | 1 +\n configs/nitrogen6s1g_defconfig | 1 +\n configs/nitrogen6s_defconfig | 1 +\n configs/novena_defconfig | 1 +\n configs/sansa_fuze_plus_defconfig | 1 +\n configs/warp7_defconfig | 1 +\n configs/warp7_secure_defconfig | 1 +\n configs/xfi3_defconfig | 1 +\n drivers/usb/gadget/Kconfig | 12 ++++++++++++\n include/configs/am335x_evm.h | 4 ----\n include/configs/am3517_evm.h | 4 ----\n include/configs/baltos.h | 4 ----\n include/configs/gw_ventana.h | 1 -\n include/configs/ma5d4evk.h | 1 -\n include/configs/nitrogen6x.h | 1 -\n include/configs/novena.h | 1 -\n include/configs/pcm051.h | 4 ----\n include/configs/sama5d2_ptc.h | 1 -\n include/configs/sansa_fuze_plus.h | 1 -\n include/configs/siemens-am33x-common.h | 4 ----\n include/configs/vinco.h | 1 -\n include/configs/warp7.h | 2 --\n include/configs/xfi3.h | 1 -\n scripts/config_whitelist.txt | 2 --\n 31 files changed, 27 insertions(+), 32 deletions(-)", "diff": "diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig\nindex 34b7a200ffbc..17ca9c9af46e 100644\n--- a/configs/gwventana_emmc_defconfig\n+++ b/configs/gwventana_emmc_defconfig\n@@ -69,6 +69,7 @@ CONFIG_G_DNL_MANUFACTURER=\"Gateworks\"\n CONFIG_G_DNL_VENDOR_NUM=0x0525\n CONFIG_G_DNL_PRODUCT_NUM=0xa4a5\n CONFIG_USB_ETHER=y\n+CONFIG_USB_ETH_CDC=y\n # CONFIG_VIDEO_SW_CURSOR is not set\n CONFIG_OF_LIBFDT=y\n CONFIG_FDT_FIXUP_PARTITIONS=y\ndiff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig\nindex 4ad0f867222e..906bac282139 100644\n--- a/configs/gwventana_gw5904_defconfig\n+++ b/configs/gwventana_gw5904_defconfig\n@@ -73,6 +73,7 @@ CONFIG_G_DNL_MANUFACTURER=\"Gateworks\"\n CONFIG_G_DNL_VENDOR_NUM=0x0525\n CONFIG_G_DNL_PRODUCT_NUM=0xa4a5\n CONFIG_USB_ETHER=y\n+CONFIG_USB_ETH_CDC=y\n # CONFIG_VIDEO_SW_CURSOR is not set\n CONFIG_OF_LIBFDT=y\n CONFIG_FDT_FIXUP_PARTITIONS=y\ndiff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig\nindex b58f27418815..05fb98c62ce8 100644\n--- a/configs/gwventana_nand_defconfig\n+++ b/configs/gwventana_nand_defconfig\n@@ -72,6 +72,7 @@ CONFIG_G_DNL_MANUFACTURER=\"Gateworks\"\n CONFIG_G_DNL_VENDOR_NUM=0x0525\n CONFIG_G_DNL_PRODUCT_NUM=0xa4a5\n CONFIG_USB_ETHER=y\n+CONFIG_USB_ETH_CDC=y\n # CONFIG_VIDEO_SW_CURSOR is not set\n CONFIG_OF_LIBFDT=y\n CONFIG_FDT_FIXUP_PARTITIONS=y\ndiff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig\nindex bab0d0c79f0d..f716c8fd7f77 100644\n--- a/configs/mx6qsabrelite_defconfig\n+++ b/configs/mx6qsabrelite_defconfig\n@@ -55,5 +55,6 @@ CONFIG_G_DNL_MANUFACTURER=\"Boundary\"\n CONFIG_G_DNL_VENDOR_NUM=0x0525\n CONFIG_G_DNL_PRODUCT_NUM=0xa4a5\n CONFIG_USB_ETHER=y\n+CONFIG_USB_ETH_CDC=y\n # CONFIG_VIDEO_SW_CURSOR is not set\n CONFIG_OF_LIBFDT=y\ndiff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig\nindex 0d19b85a30f3..fd4a46558129 100644\n--- a/configs/nitrogen6dl2g_defconfig\n+++ b/configs/nitrogen6dl2g_defconfig\n@@ -52,5 +52,6 @@ CONFIG_G_DNL_MANUFACTURER=\"Boundary\"\n CONFIG_G_DNL_VENDOR_NUM=0x0525\n CONFIG_G_DNL_PRODUCT_NUM=0xa4a5\n CONFIG_USB_ETHER=y\n+CONFIG_USB_ETH_CDC=y\n # CONFIG_VIDEO_SW_CURSOR is not set\n CONFIG_OF_LIBFDT=y\ndiff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig\nindex a20580eb77bb..30046e3f3a07 100644\n--- a/configs/nitrogen6dl_defconfig\n+++ b/configs/nitrogen6dl_defconfig\n@@ -52,5 +52,6 @@ CONFIG_G_DNL_MANUFACTURER=\"Boundary\"\n CONFIG_G_DNL_VENDOR_NUM=0x0525\n CONFIG_G_DNL_PRODUCT_NUM=0xa4a5\n CONFIG_USB_ETHER=y\n+CONFIG_USB_ETH_CDC=y\n # CONFIG_VIDEO_SW_CURSOR is not set\n CONFIG_OF_LIBFDT=y\ndiff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig\nindex 940c74a5ece2..f9160c208fe7 100644\n--- a/configs/nitrogen6q2g_defconfig\n+++ b/configs/nitrogen6q2g_defconfig\n@@ -53,5 +53,6 @@ CONFIG_G_DNL_MANUFACTURER=\"Boundary\"\n CONFIG_G_DNL_VENDOR_NUM=0x0525\n CONFIG_G_DNL_PRODUCT_NUM=0xa4a5\n CONFIG_USB_ETHER=y\n+CONFIG_USB_ETH_CDC=y\n # CONFIG_VIDEO_SW_CURSOR is not set\n CONFIG_OF_LIBFDT=y\ndiff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig\nindex 83772cb2efcf..8bca0e04439e 100644\n--- a/configs/nitrogen6q_defconfig\n+++ b/configs/nitrogen6q_defconfig\n@@ -53,5 +53,6 @@ CONFIG_G_DNL_MANUFACTURER=\"Boundary\"\n CONFIG_G_DNL_VENDOR_NUM=0x0525\n CONFIG_G_DNL_PRODUCT_NUM=0xa4a5\n CONFIG_USB_ETHER=y\n+CONFIG_USB_ETH_CDC=y\n # CONFIG_VIDEO_SW_CURSOR is not set\n CONFIG_OF_LIBFDT=y\ndiff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig\nindex 862b41a3f8c9..668fbaa37010 100644\n--- a/configs/nitrogen6s1g_defconfig\n+++ b/configs/nitrogen6s1g_defconfig\n@@ -52,5 +52,6 @@ CONFIG_G_DNL_MANUFACTURER=\"Boundary\"\n CONFIG_G_DNL_VENDOR_NUM=0x0525\n CONFIG_G_DNL_PRODUCT_NUM=0xa4a5\n CONFIG_USB_ETHER=y\n+CONFIG_USB_ETH_CDC=y\n # CONFIG_VIDEO_SW_CURSOR is not set\n CONFIG_OF_LIBFDT=y\ndiff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig\nindex e5376313b9bd..99106c9a1f5a 100644\n--- a/configs/nitrogen6s_defconfig\n+++ b/configs/nitrogen6s_defconfig\n@@ -52,5 +52,6 @@ CONFIG_G_DNL_MANUFACTURER=\"Boundary\"\n CONFIG_G_DNL_VENDOR_NUM=0x0525\n CONFIG_G_DNL_PRODUCT_NUM=0xa4a5\n CONFIG_USB_ETHER=y\n+CONFIG_USB_ETH_CDC=y\n # CONFIG_VIDEO_SW_CURSOR is not set\n CONFIG_OF_LIBFDT=y\ndiff --git a/configs/novena_defconfig b/configs/novena_defconfig\nindex 7ca16c98f5b3..3381b7514496 100644\n--- a/configs/novena_defconfig\n+++ b/configs/novena_defconfig\n@@ -49,6 +49,7 @@ CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y\n CONFIG_USB_GADGET=y\n CONFIG_CI_UDC=y\n CONFIG_USB_ETHER=y\n+CONFIG_USB_ETH_CDC=y\n # CONFIG_VIDEO_SW_CURSOR is not set\n CONFIG_FAT_WRITE=y\n CONFIG_OF_LIBFDT=y\ndiff --git a/configs/sansa_fuze_plus_defconfig b/configs/sansa_fuze_plus_defconfig\nindex c6d50ccb8e15..b5443dda98a9 100644\n--- a/configs/sansa_fuze_plus_defconfig\n+++ b/configs/sansa_fuze_plus_defconfig\n@@ -33,4 +33,5 @@ CONFIG_USB_EHCI_HCD=y\n CONFIG_USB_GADGET=y\n CONFIG_CI_UDC=y\n CONFIG_USB_ETHER=y\n+CONFIG_USB_ETH_CDC=y\n CONFIG_OF_LIBFDT=y\ndiff --git a/configs/warp7_defconfig b/configs/warp7_defconfig\nindex 8a3717facdbd..32cf7a4da4b4 100644\n--- a/configs/warp7_defconfig\n+++ b/configs/warp7_defconfig\n@@ -39,5 +39,6 @@ CONFIG_G_DNL_MANUFACTURER=\"FSL\"\n CONFIG_G_DNL_VENDOR_NUM=0x0525\n CONFIG_G_DNL_PRODUCT_NUM=0xa4a5\n CONFIG_USB_ETHER=y\n+CONFIG_USB_ETH_CDC=y\n CONFIG_USBNET_HOST_ADDR=\"de:ad:be:af:00:00\"\n CONFIG_OF_LIBFDT=y\ndiff --git a/configs/warp7_secure_defconfig b/configs/warp7_secure_defconfig\nindex 83a06079fdc5..99764dbd0bb1 100644\n--- a/configs/warp7_secure_defconfig\n+++ b/configs/warp7_secure_defconfig\n@@ -37,5 +37,6 @@ CONFIG_G_DNL_MANUFACTURER=\"FSL\"\n CONFIG_G_DNL_VENDOR_NUM=0x0525\n CONFIG_G_DNL_PRODUCT_NUM=0xa4a5\n CONFIG_USB_ETHER=y\n+CONFIG_USB_ETH_CDC=y\n CONFIG_USBNET_HOST_ADDR=\"de:ad:be:af:00:00\"\n CONFIG_OF_LIBFDT=y\ndiff --git a/configs/xfi3_defconfig b/configs/xfi3_defconfig\nindex 6cc78452829c..91768a4a7106 100644\n--- a/configs/xfi3_defconfig\n+++ b/configs/xfi3_defconfig\n@@ -32,4 +32,5 @@ CONFIG_USB_EHCI_HCD=y\n CONFIG_USB_GADGET=y\n CONFIG_CI_UDC=y\n CONFIG_USB_ETHER=y\n+CONFIG_USB_ETH_CDC=y\n CONFIG_OF_LIBFDT=y\ndiff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig\nindex 4f29beba1c52..878495fd5d03 100644\n--- a/drivers/usb/gadget/Kconfig\n+++ b/drivers/usb/gadget/Kconfig\n@@ -129,6 +129,18 @@ config USB_ETHER\n \n if USB_ETHER\n \n+choice\n+\tprompt \"USB Ethernet Gadget Model\"\n+\tdefault USB_ETH_RNDIS\n+\n+config USB_ETH_CDC\n+\tbool \"CDC-Ethernet model\"\n+\n+config USB_ETH_RNDIS\n+\tbool \"RNDIS model\"\n+\n+endchoice\n+\n config USBNET_DEVADDR\n \tstring \"USB Gadget Ethernet device mac address\"\n \tdefault \"de:ad:be:ef:00:01\"\ndiff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h\nindex 9238c4bb769c..96294679bf9b 100644\n--- a/include/configs/am335x_evm.h\n+++ b/include/configs/am335x_evm.h\n@@ -263,10 +263,6 @@\n #define CONFIG_AM335X_USB1\n #define CONFIG_AM335X_USB1_MODE MUSB_HOST\n \n-#ifdef CONFIG_USB_MUSB_GADGET\n-#define CONFIG_USB_ETH_RNDIS\n-#endif /* CONFIG_USB_MUSB_GADGET */\n-\n /*\n * Disable MMC DM for SPL build and can be re-enabled after adding\n * DM support in SPL\ndiff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h\nindex d09672770134..38bd6e35e8cd 100644\n--- a/include/configs/am3517_evm.h\n+++ b/include/configs/am3517_evm.h\n@@ -79,10 +79,6 @@\n \n #endif /* CONFIG_USB_MUSB_HOST */\n \n-#ifdef CONFIG_USB_MUSB_GADGET\n-#define CONFIG_USB_ETH_RNDIS\n-#endif /* CONFIG_USB_MUSB_GADGET */\n-\n #endif /* CONFIG_USB_MUSB_AM35X */\n \n /* I2C */\ndiff --git a/include/configs/baltos.h b/include/configs/baltos.h\nindex 380a78918f29..44af4d3deec8 100644\n--- a/include/configs/baltos.h\n+++ b/include/configs/baltos.h\n@@ -283,10 +283,6 @@\n #define CONFIG_AM335X_USB1\n #define CONFIG_AM335X_USB1_MODE MUSB_OTG\n \n-#ifdef CONFIG_USB_MUSB_GADGET\n-#define CONFIG_USB_ETH_RNDIS\n-#endif /* CONFIG_USB_MUSB_GADGET */\n-\n #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT)\n /* disable host part of MUSB in SPL */\n /* disable EFI partitions and partition UUID support */\ndiff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h\nindex 6142e009b715..35a642cf2f1b 100644\n--- a/include/configs/gw_ventana.h\n+++ b/include/configs/gw_ventana.h\n@@ -149,7 +149,6 @@\n #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)\n #define CONFIG_MXC_USB_FLAGS 0\n #define CONFIG_USBD_HS\n-#define CONFIG_USB_ETH_CDC\n #define CONFIG_NETCONSOLE\n \n /* USB Mass Storage Gadget */\ndiff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h\nindex 2ad4952f5eeb..6d25d84c6eb6 100644\n--- a/include/configs/ma5d4evk.h\n+++ b/include/configs/ma5d4evk.h\n@@ -97,7 +97,6 @@\n #ifdef CONFIG_CMD_USB\n \n /* USB device */\n-#define CONFIG_USB_ETH_RNDIS\n #define CONFIG_USBNET_MANUFACTURER \"AriesEmbedded\"\n #define CONFIG_USB_FUNCTION_MASS_STORAGE\n #define CONFIG_SYS_DFU_DATA_BUF_SIZE\t(1 * 1024 * 1024)\ndiff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h\nindex a3466d24f9c0..e234427bebe6 100644\n--- a/include/configs/nitrogen6x.h\n+++ b/include/configs/nitrogen6x.h\n@@ -19,7 +19,6 @@\n \n #define CONFIG_MISC_INIT_R\n #define CONFIG_USBD_HS\n-#define CONFIG_USB_ETH_CDC\n #define CONFIG_NETCONSOLE\n \n #define CONFIG_MXC_UART\ndiff --git a/include/configs/novena.h b/include/configs/novena.h\nindex a1a66d2f863c..120c5bf62a3b 100644\n--- a/include/configs/novena.h\n+++ b/include/configs/novena.h\n@@ -132,7 +132,6 @@\n #define CONFIG_MXC_USB_FLAGS\t\t0\n /* Gadget part */\n #define CONFIG_USBD_HS\n-#define CONFIG_USB_ETH_CDC\n #define CONFIG_NETCONSOLE\n #endif\n \ndiff --git a/include/configs/pcm051.h b/include/configs/pcm051.h\nindex 309bbd6bd36f..79f3f48df87e 100644\n--- a/include/configs/pcm051.h\n+++ b/include/configs/pcm051.h\n@@ -133,10 +133,6 @@\n #define CONFIG_AM335X_USB1\n #define CONFIG_AM335X_USB1_MODE MUSB_HOST\n \n-#ifdef CONFIG_USB_MUSB_GADGET\n-#define CONFIG_USB_ETH_RNDIS\n-#endif /* CONFIG_USB_MUSB_GADGET */\n-\n #define CONFIG_PHY_SMSC\n \n #endif\t/* ! __CONFIG_PCM051_H */\ndiff --git a/include/configs/sama5d2_ptc.h b/include/configs/sama5d2_ptc.h\nindex a1a0602cdd0c..543592e3a574 100644\n--- a/include/configs/sama5d2_ptc.h\n+++ b/include/configs/sama5d2_ptc.h\n@@ -60,7 +60,6 @@\n #endif\n \n /* USB device */\n-#define CONFIG_USB_ETH_RNDIS\n #define CONFIG_USBNET_MANUFACTURER \"Atmel SAMA5D2_PTC\"\n \n /* Ethernet Hardware */\ndiff --git a/include/configs/sansa_fuze_plus.h b/include/configs/sansa_fuze_plus.h\nindex 9e33ca42270c..99200140fe5e 100644\n--- a/include/configs/sansa_fuze_plus.h\n+++ b/include/configs/sansa_fuze_plus.h\n@@ -39,7 +39,6 @@\n #define CONFIG_EHCI_MXS_PORT0\n #define CONFIG_USB_MAX_CONTROLLER_COUNT 1\n \n-#define CONFIG_USB_ETH_CDC\n #define CONFIG_NETCONSOLE\n #endif\n \ndiff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h\nindex 0600984f95aa..1997c2dd5ae4 100644\n--- a/include/configs/siemens-am33x-common.h\n+++ b/include/configs/siemens-am33x-common.h\n@@ -178,10 +178,6 @@\n #define CONFIG_AM335X_USB1\n #define CONFIG_AM335X_USB1_MODE MUSB_HOST\n \n-#ifdef CONFIG_USB_MUSB_GADGET\n-#define CONFIG_USB_ETH_RNDIS\n-#endif /* CONFIG_USB_MUSB_GADGET */\n-\n /* USB DRACO ID as default */\n #define CONFIG_USBD_HS\n \ndiff --git a/include/configs/vinco.h b/include/configs/vinco.h\nindex ce20e3bf35ba..d3d5dc8f7732 100644\n--- a/include/configs/vinco.h\n+++ b/include/configs/vinco.h\n@@ -64,7 +64,6 @@\n #endif\n \n /* USB device */\n-#define CONFIG_USB_ETH_RNDIS\n #define CONFIG_USBNET_MANUFACTURER \"L+G VInCo\"\n \n /* Ethernet Hardware */\ndiff --git a/include/configs/warp7.h b/include/configs/warp7.h\nindex 05ae3542a9ad..11f1bc3eab75 100644\n--- a/include/configs/warp7.h\n+++ b/include/configs/warp7.h\n@@ -136,8 +136,6 @@\n #define CONFIG_SYS_DFU_DATA_BUF_SIZE\tSZ_16M\n #define DFU_DEFAULT_POLL_TIMEOUT\t300\n \n-#define CONFIG_USB_ETH_CDC\n-#define CONFIG_USB_ETH_RNDIS\n #define CONFIG_USBNET_DEV_ADDR\t\t\"de:ad:be:af:00:01\"\n \n #endif\ndiff --git a/include/configs/xfi3.h b/include/configs/xfi3.h\nindex 7bbfd75c0cb8..1e70a762e0d9 100644\n--- a/include/configs/xfi3.h\n+++ b/include/configs/xfi3.h\n@@ -39,7 +39,6 @@\n #define CONFIG_EHCI_MXS_PORT0\n #define CONFIG_USB_MAX_CONTROLLER_COUNT 1\n \n-#define CONFIG_USB_ETH_CDC\n #define CONFIG_NETCONSOLE\n #endif\n \ndiff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt\nindex aa352bad8a9f..c1285ce27fec 100644\n--- a/scripts/config_whitelist.txt\n+++ b/scripts/config_whitelist.txt\n@@ -5031,9 +5031,7 @@ CONFIG_USB_ETHER_RNDIS\n CONFIG_USB_ETHER_RTL8152\n CONFIG_USB_ETHER_SMSC95XX\n CONFIG_USB_ETHER_xxx\n-CONFIG_USB_ETH_CDC\n CONFIG_USB_ETH_QMULT\n-CONFIG_USB_ETH_RNDIS\n CONFIG_USB_ETH_SUBSET\n CONFIG_USB_EXT2_BOOT\n CONFIG_USB_FAT_BOOT\n", "prefixes": [ "U-Boot", "04/13" ] }