| Message ID | c1096e0d2b5824d6106841ad36da4c67fe57861d.1505242834.git-series.maxime.ripard@free-electrons.com |
|---|---|
| State | New |
| Headers | show |
| Series | sunxi: convert musb to the device model and enable usb_ether | expand |
On 12 September 2017 at 13:01, Maxime Ripard <maxime.ripard@free-electrons.com> wrote: > The USB Ethernet gadget option has not yet been moved to Kconfig, let's > deal with that. > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > --- > configs/am335x_baltos_defconfig | 1 + > configs/am335x_boneblack_defconfig | 1 + > configs/am335x_boneblack_vboot_defconfig | 1 + > configs/am335x_evm_defconfig | 1 + > configs/am335x_evm_nor_defconfig | 1 + > configs/am335x_evm_norboot_defconfig | 1 + > configs/am335x_evm_spiboot_defconfig | 1 + > configs/am335x_evm_usbspl_defconfig | 1 + > configs/am335x_hs_evm_defconfig | 1 + > configs/draco_defconfig | 1 + > configs/etamin_defconfig | 1 + > configs/gwventana_emmc_defconfig | 1 + > configs/gwventana_gw5904_defconfig | 1 + > configs/gwventana_nand_defconfig | 1 + > configs/ma5d4evk_defconfig | 1 + > configs/mx6qsabrelite_defconfig | 1 + > configs/nitrogen6dl2g_defconfig | 1 + > configs/nitrogen6dl_defconfig | 1 + > configs/nitrogen6q2g_defconfig | 1 + > configs/nitrogen6q_defconfig | 1 + > configs/nitrogen6s1g_defconfig | 1 + > configs/nitrogen6s_defconfig | 1 + > configs/novena_defconfig | 1 + > configs/omap3_beagle_defconfig | 1 + > configs/omap3_evm_defconfig | 1 + > configs/omap3_logic_defconfig | 1 + > configs/pcm051_rev1_defconfig | 1 + > configs/pcm051_rev3_defconfig | 1 + > configs/pxm2_defconfig | 1 + > configs/rastaban_defconfig | 1 + > configs/rut_defconfig | 1 + > configs/sama5d2_ptc_nandflash_defconfig | 1 + > configs/sama5d2_ptc_spiflash_defconfig | 1 + > configs/sansa_fuze_plus_defconfig | 1 + > configs/thuban_defconfig | 1 + > configs/vinco_defconfig | 1 + > configs/warp7_defconfig | 1 + > configs/warp7_secure_defconfig | 1 + > configs/xfi3_defconfig | 1 + > drivers/usb/gadget/Kconfig | 14 ++++++++++++++ > include/configs/am335x_evm.h | 1 - > include/configs/am3517_evm.h | 1 - > include/configs/baltos.h | 1 - > include/configs/gw_ventana.h | 1 - > include/configs/h2200.h | 1 - > include/configs/ma5d4evk.h | 1 - > include/configs/nitrogen6x.h | 1 - > include/configs/novena.h | 1 - > include/configs/omap3_beagle.h | 1 - > include/configs/omap3_evm.h | 1 - > include/configs/omap3_logic.h | 1 - > include/configs/pcm051.h | 1 - > include/configs/sama5d2_ptc.h | 1 - > include/configs/sansa_fuze_plus.h | 1 - > include/configs/siemens-am33x-common.h | 1 - > include/configs/tao3530.h | 2 -- > include/configs/vinco.h | 1 - > include/configs/warp7.h | 1 - > include/configs/xfi3.h | 1 - > scripts/config_whitelist.txt | 1 - > 60 files changed, 53 insertions(+), 21 deletions(-) > Reviewed-by: Simon Glass <sjg@chromium.org>
On 09/12/2017 09:01 PM, Maxime Ripard wrote: > The USB Ethernet gadget option has not yet been moved to Kconfig, let's > deal with that. Reviewed-by: Łukasz Majewski <lukma@denx.de> > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > --- > configs/am335x_baltos_defconfig | 1 + > configs/am335x_boneblack_defconfig | 1 + > configs/am335x_boneblack_vboot_defconfig | 1 + > configs/am335x_evm_defconfig | 1 + > configs/am335x_evm_nor_defconfig | 1 + > configs/am335x_evm_norboot_defconfig | 1 + > configs/am335x_evm_spiboot_defconfig | 1 + > configs/am335x_evm_usbspl_defconfig | 1 + > configs/am335x_hs_evm_defconfig | 1 + > configs/draco_defconfig | 1 + > configs/etamin_defconfig | 1 + > configs/gwventana_emmc_defconfig | 1 + > configs/gwventana_gw5904_defconfig | 1 + > configs/gwventana_nand_defconfig | 1 + > configs/ma5d4evk_defconfig | 1 + > configs/mx6qsabrelite_defconfig | 1 + > configs/nitrogen6dl2g_defconfig | 1 + > configs/nitrogen6dl_defconfig | 1 + > configs/nitrogen6q2g_defconfig | 1 + > configs/nitrogen6q_defconfig | 1 + > configs/nitrogen6s1g_defconfig | 1 + > configs/nitrogen6s_defconfig | 1 + > configs/novena_defconfig | 1 + > configs/omap3_beagle_defconfig | 1 + > configs/omap3_evm_defconfig | 1 + > configs/omap3_logic_defconfig | 1 + > configs/pcm051_rev1_defconfig | 1 + > configs/pcm051_rev3_defconfig | 1 + > configs/pxm2_defconfig | 1 + > configs/rastaban_defconfig | 1 + > configs/rut_defconfig | 1 + > configs/sama5d2_ptc_nandflash_defconfig | 1 + > configs/sama5d2_ptc_spiflash_defconfig | 1 + > configs/sansa_fuze_plus_defconfig | 1 + > configs/thuban_defconfig | 1 + > configs/vinco_defconfig | 1 + > configs/warp7_defconfig | 1 + > configs/warp7_secure_defconfig | 1 + > configs/xfi3_defconfig | 1 + > drivers/usb/gadget/Kconfig | 14 ++++++++++++++ > include/configs/am335x_evm.h | 1 - > include/configs/am3517_evm.h | 1 - > include/configs/baltos.h | 1 - > include/configs/gw_ventana.h | 1 - > include/configs/h2200.h | 1 - > include/configs/ma5d4evk.h | 1 - > include/configs/nitrogen6x.h | 1 - > include/configs/novena.h | 1 - > include/configs/omap3_beagle.h | 1 - > include/configs/omap3_evm.h | 1 - > include/configs/omap3_logic.h | 1 - > include/configs/pcm051.h | 1 - > include/configs/sama5d2_ptc.h | 1 - > include/configs/sansa_fuze_plus.h | 1 - > include/configs/siemens-am33x-common.h | 1 - > include/configs/tao3530.h | 2 -- > include/configs/vinco.h | 1 - > include/configs/warp7.h | 1 - > include/configs/xfi3.h | 1 - > scripts/config_whitelist.txt | 1 - > 60 files changed, 53 insertions(+), 21 deletions(-) > > diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig > index be057acf8634..2f075091b27a 100644 > --- a/configs/am335x_baltos_defconfig > +++ b/configs/am335x_baltos_defconfig > @@ -63,6 +63,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y > CONFIG_G_DNL_MANUFACTURER="Texas Instruments" > CONFIG_G_DNL_VENDOR_NUM=0x0403 > CONFIG_G_DNL_PRODUCT_NUM=0xbd00 > +CONFIG_USB_ETHER=y > 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 719d16b145eb..a3dd9b03b538 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_USB_ETHER=y > CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00" > CONFIG_LZO=y > CONFIG_OF_LIBFDT=y > diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig > index 0a239bb73399..7d52382c24dc 100644 > --- a/configs/am335x_boneblack_vboot_defconfig > +++ b/configs/am335x_boneblack_vboot_defconfig > @@ -52,4 +52,5 @@ CONFIG_USB_GADGET_DOWNLOAD=y > CONFIG_G_DNL_MANUFACTURER="Texas Instruments" > CONFIG_G_DNL_VENDOR_NUM=0x0451 > CONFIG_G_DNL_PRODUCT_NUM=0xd022 > +CONFIG_USB_ETHER=y > CONFIG_LZO=y > diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig > index 00c1af43449d..69b2cf3e1f61 100644 > --- a/configs/am335x_evm_defconfig > +++ b/configs/am335x_evm_defconfig > @@ -54,6 +54,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_USB_ETHER=y > CONFIG_RSA=y > CONFIG_LZO=y > CONFIG_OF_LIBFDT_OVERLAY=y > diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig > index 9f08edff4ca5..708df4284093 100644 > --- a/configs/am335x_evm_nor_defconfig > +++ b/configs/am335x_evm_nor_defconfig > @@ -41,6 +41,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_USB_ETHER=y > 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 c9eab68c8299..3f6f2798adce 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_USB_ETHER=y > CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00" > CONFIG_LZO=y > CONFIG_OF_LIBFDT=y > diff --git a/configs/am335x_evm_spiboot_defconfig b/configs/am335x_evm_spiboot_defconfig > index 501fb2b90f4d..427ca371815c 100644 > --- a/configs/am335x_evm_spiboot_defconfig > +++ b/configs/am335x_evm_spiboot_defconfig > @@ -39,6 +39,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_USB_ETHER=y > CONFIG_LZO=y > CONFIG_OF_LIBFDT=y > CONFIG_OF_LIBFDT_OVERLAY=y > diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig > index 7c351382d96c..a4e9e8f1b27b 100644 > --- a/configs/am335x_evm_usbspl_defconfig > +++ b/configs/am335x_evm_usbspl_defconfig > @@ -45,6 +45,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_USB_ETHER=y > CONFIG_LZO=y > CONFIG_OF_LIBFDT=y > CONFIG_OF_LIBFDT_OVERLAY=y > diff --git a/configs/am335x_hs_evm_defconfig b/configs/am335x_hs_evm_defconfig > index acdd56b43558..552150732398 100644 > --- a/configs/am335x_hs_evm_defconfig > +++ b/configs/am335x_hs_evm_defconfig > @@ -58,5 +58,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y > CONFIG_G_DNL_MANUFACTURER="Texas Instruments" > CONFIG_G_DNL_VENDOR_NUM=0x0451 > CONFIG_G_DNL_PRODUCT_NUM=0xd022 > +CONFIG_USB_ETHER=y > CONFIG_RSA=y > CONFIG_LZO=y > diff --git a/configs/draco_defconfig b/configs/draco_defconfig > index f5a2c1b52621..e38030bf5913 100644 > --- a/configs/draco_defconfig > +++ b/configs/draco_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_USB_ETHER=y > diff --git a/configs/etamin_defconfig b/configs/etamin_defconfig > index 148d4218c090..33ca6858abfd 100644 > --- a/configs/etamin_defconfig > +++ b/configs/etamin_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_USB_ETHER=y > diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig > index 74aa2ef56621..35d9e1ac27dc 100644 > --- a/configs/gwventana_emmc_defconfig > +++ b/configs/gwventana_emmc_defconfig > @@ -68,6 +68,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y > CONFIG_G_DNL_MANUFACTURER="Gateworks" > CONFIG_G_DNL_VENDOR_NUM=0x0525 > CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 > +CONFIG_USB_ETHER=y > CONFIG_USB_HOST_ETHER=y > CONFIG_USB_ETHER_ASIX=y > CONFIG_USB_ETHER_SMSC95XX=y > diff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig > index 7bbdd500a78c..ca7eb5ac573e 100644 > --- a/configs/gwventana_gw5904_defconfig > +++ b/configs/gwventana_gw5904_defconfig > @@ -72,6 +72,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y > CONFIG_G_DNL_MANUFACTURER="Gateworks" > CONFIG_G_DNL_VENDOR_NUM=0x0525 > CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 > +CONFIG_USB_ETHER=y > CONFIG_USB_HOST_ETHER=y > CONFIG_USB_ETHER_ASIX=y > CONFIG_USB_ETHER_SMSC95XX=y > diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig > index aaedf93eeac9..cb9655574888 100644 > --- a/configs/gwventana_nand_defconfig > +++ b/configs/gwventana_nand_defconfig > @@ -71,6 +71,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y > CONFIG_G_DNL_MANUFACTURER="Gateworks" > CONFIG_G_DNL_VENDOR_NUM=0x0525 > CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 > +CONFIG_USB_ETHER=y > CONFIG_USB_HOST_ETHER=y > CONFIG_USB_ETHER_ASIX=y > CONFIG_USB_ETHER_SMSC95XX=y > diff --git a/configs/ma5d4evk_defconfig b/configs/ma5d4evk_defconfig > index 0d8c109fbcf1..0655505a1321 100644 > --- a/configs/ma5d4evk_defconfig > +++ b/configs/ma5d4evk_defconfig > @@ -52,6 +52,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y > CONFIG_G_DNL_MANUFACTURER="AriesEmbedded" > CONFIG_G_DNL_VENDOR_NUM=0x0525 > CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 > +CONFIG_USB_ETHER=y > CONFIG_FAT_WRITE=y > CONFIG_OF_LIBFDT=y > # CONFIG_EFI_LOADER is not set > diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig > index 57aba7e6d09a..bab0d0c79f0d 100644 > --- a/configs/mx6qsabrelite_defconfig > +++ b/configs/mx6qsabrelite_defconfig > @@ -54,5 +54,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y > CONFIG_G_DNL_MANUFACTURER="Boundary" > CONFIG_G_DNL_VENDOR_NUM=0x0525 > CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 > +CONFIG_USB_ETHER=y > # CONFIG_VIDEO_SW_CURSOR is not set > CONFIG_OF_LIBFDT=y > diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig > index 50e6b70bc9a0..0d19b85a30f3 100644 > --- a/configs/nitrogen6dl2g_defconfig > +++ b/configs/nitrogen6dl2g_defconfig > @@ -51,5 +51,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y > CONFIG_G_DNL_MANUFACTURER="Boundary" > CONFIG_G_DNL_VENDOR_NUM=0x0525 > CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 > +CONFIG_USB_ETHER=y > # CONFIG_VIDEO_SW_CURSOR is not set > CONFIG_OF_LIBFDT=y > diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig > index 61e5ea4e21ef..a20580eb77bb 100644 > --- a/configs/nitrogen6dl_defconfig > +++ b/configs/nitrogen6dl_defconfig > @@ -51,5 +51,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y > CONFIG_G_DNL_MANUFACTURER="Boundary" > CONFIG_G_DNL_VENDOR_NUM=0x0525 > CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 > +CONFIG_USB_ETHER=y > # CONFIG_VIDEO_SW_CURSOR is not set > CONFIG_OF_LIBFDT=y > diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig > index 9dbb7181ee23..940c74a5ece2 100644 > --- a/configs/nitrogen6q2g_defconfig > +++ b/configs/nitrogen6q2g_defconfig > @@ -52,5 +52,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y > CONFIG_G_DNL_MANUFACTURER="Boundary" > CONFIG_G_DNL_VENDOR_NUM=0x0525 > CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 > +CONFIG_USB_ETHER=y > # CONFIG_VIDEO_SW_CURSOR is not set > CONFIG_OF_LIBFDT=y > diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig > index 5478390fd8c3..83772cb2efcf 100644 > --- a/configs/nitrogen6q_defconfig > +++ b/configs/nitrogen6q_defconfig > @@ -52,5 +52,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y > CONFIG_G_DNL_MANUFACTURER="Boundary" > CONFIG_G_DNL_VENDOR_NUM=0x0525 > CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 > +CONFIG_USB_ETHER=y > # CONFIG_VIDEO_SW_CURSOR is not set > CONFIG_OF_LIBFDT=y > diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig > index 01881686429b..862b41a3f8c9 100644 > --- a/configs/nitrogen6s1g_defconfig > +++ b/configs/nitrogen6s1g_defconfig > @@ -51,5 +51,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y > CONFIG_G_DNL_MANUFACTURER="Boundary" > CONFIG_G_DNL_VENDOR_NUM=0x0525 > CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 > +CONFIG_USB_ETHER=y > # CONFIG_VIDEO_SW_CURSOR is not set > CONFIG_OF_LIBFDT=y > diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig > index 51f1f91be854..e5376313b9bd 100644 > --- a/configs/nitrogen6s_defconfig > +++ b/configs/nitrogen6s_defconfig > @@ -51,5 +51,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y > CONFIG_G_DNL_MANUFACTURER="Boundary" > CONFIG_G_DNL_VENDOR_NUM=0x0525 > CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 > +CONFIG_USB_ETHER=y > # CONFIG_VIDEO_SW_CURSOR is not set > CONFIG_OF_LIBFDT=y > diff --git a/configs/novena_defconfig b/configs/novena_defconfig > index 2921525f9fb0..786ab2854f70 100644 > --- a/configs/novena_defconfig > +++ b/configs/novena_defconfig > @@ -48,6 +48,7 @@ CONFIG_USB_KEYBOARD=y > CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y > CONFIG_USB_GADGET=y > CONFIG_CI_UDC=y > +CONFIG_USB_ETHER=y > CONFIG_USB_HOST_ETHER=y > CONFIG_USB_ETHER_ASIX=y > CONFIG_USB_ETHER_SMSC95XX=y > diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig > index cf888f3491aa..8896b84ebc9a 100644 > --- a/configs/omap3_beagle_defconfig > +++ b/configs/omap3_beagle_defconfig > @@ -52,6 +52,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y > CONFIG_G_DNL_MANUFACTURER="TI" > CONFIG_G_DNL_VENDOR_NUM=0x0451 > CONFIG_G_DNL_PRODUCT_NUM=0xd022 > +CONFIG_USB_ETHER=y > CONFIG_USB_HOST_ETHER=y > CONFIG_USB_ETHER_ASIX=y > CONFIG_USB_ETHER_MCS7830=y > diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig > index 962ffa072996..8db95f167a1a 100644 > --- a/configs/omap3_evm_defconfig > +++ b/configs/omap3_evm_defconfig > @@ -56,6 +56,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y > CONFIG_G_DNL_MANUFACTURER="Texas Instruments" > CONFIG_G_DNL_VENDOR_NUM=0x0451 > CONFIG_G_DNL_PRODUCT_NUM=0x5678 > +CONFIG_USB_ETHER=y > CONFIG_FAT_WRITE=y > CONFIG_BCH=y > CONFIG_OF_LIBFDT=y > diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig > index 8d0a4d48e415..3bf115e6f8c8 100644 > --- a/configs/omap3_logic_defconfig > +++ b/configs/omap3_logic_defconfig > @@ -49,4 +49,5 @@ CONFIG_USB_GADGET_DOWNLOAD=y > CONFIG_G_DNL_MANUFACTURER="TI" > CONFIG_G_DNL_VENDOR_NUM=0x0451 > CONFIG_G_DNL_PRODUCT_NUM=0xd022 > +CONFIG_USB_ETHER=y > CONFIG_BCH=y > diff --git a/configs/pcm051_rev1_defconfig b/configs/pcm051_rev1_defconfig > index 1683f88b690b..9b325d43ba79 100644 > --- a/configs/pcm051_rev1_defconfig > +++ b/configs/pcm051_rev1_defconfig > @@ -60,5 +60,6 @@ CONFIG_USB_MUSB_HOST=y > CONFIG_USB_MUSB_GADGET=y > CONFIG_USB_STORAGE=y > CONFIG_USB_GADGET=y > +CONFIG_USB_ETHER=y > CONFIG_FAT_WRITE=y > CONFIG_OF_LIBFDT=y > diff --git a/configs/pcm051_rev3_defconfig b/configs/pcm051_rev3_defconfig > index d082bb4af204..14211ec6835e 100644 > --- a/configs/pcm051_rev3_defconfig > +++ b/configs/pcm051_rev3_defconfig > @@ -60,5 +60,6 @@ CONFIG_USB_MUSB_HOST=y > CONFIG_USB_MUSB_GADGET=y > CONFIG_USB_STORAGE=y > CONFIG_USB_GADGET=y > +CONFIG_USB_ETHER=y > CONFIG_FAT_WRITE=y > CONFIG_OF_LIBFDT=y > diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig > index b1da71d4c7ed..b6624f0be16c 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_USB_ETHER=y > CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00" > # CONFIG_VIDEO_SW_CURSOR is not set > CONFIG_SYS_CONSOLE_BG_COL=0xff > diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig > index 940c4144d406..ed5f2f841b2a 100644 > --- a/configs/rastaban_defconfig > +++ b/configs/rastaban_defconfig > @@ -70,4 +70,5 @@ CONFIG_USB_GADGET_DOWNLOAD=y > CONFIG_G_DNL_MANUFACTURER="Siemens AG" > CONFIG_G_DNL_VENDOR_NUM=0x0908 > CONFIG_G_DNL_PRODUCT_NUM=0x02d2 > +CONFIG_USB_ETHER=y > CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00" > diff --git a/configs/rut_defconfig b/configs/rut_defconfig > index 6ec8ff35710e..1b787906baf9 100644 > --- a/configs/rut_defconfig > +++ b/configs/rut_defconfig > @@ -75,6 +75,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_USB_ETHER=y > # CONFIG_VIDEO_SW_CURSOR is not set > CONFIG_SYS_CONSOLE_BG_COL=0xff > CONFIG_SYS_CONSOLE_FG_COL=0x00 > diff --git a/configs/sama5d2_ptc_nandflash_defconfig b/configs/sama5d2_ptc_nandflash_defconfig > index bca3ac2fcbfc..6672a5ce11f7 100644 > --- a/configs/sama5d2_ptc_nandflash_defconfig > +++ b/configs/sama5d2_ptc_nandflash_defconfig > @@ -30,3 +30,4 @@ CONFIG_USB_EHCI_HCD=y > CONFIG_USB_STORAGE=y > CONFIG_USB_GADGET=y > CONFIG_USB_GADGET_ATMEL_USBA=y > +CONFIG_USB_ETHER=y > diff --git a/configs/sama5d2_ptc_spiflash_defconfig b/configs/sama5d2_ptc_spiflash_defconfig > index e4fb49f6627d..9a23a808f1b3 100644 > --- a/configs/sama5d2_ptc_spiflash_defconfig > +++ b/configs/sama5d2_ptc_spiflash_defconfig > @@ -31,3 +31,4 @@ CONFIG_USB_EHCI_HCD=y > CONFIG_USB_STORAGE=y > CONFIG_USB_GADGET=y > CONFIG_USB_GADGET_ATMEL_USBA=y > +CONFIG_USB_ETHER=y > diff --git a/configs/sansa_fuze_plus_defconfig b/configs/sansa_fuze_plus_defconfig > index f6ce09c366b4..c6d50ccb8e15 100644 > --- a/configs/sansa_fuze_plus_defconfig > +++ b/configs/sansa_fuze_plus_defconfig > @@ -32,4 +32,5 @@ CONFIG_USB=y > CONFIG_USB_EHCI_HCD=y > CONFIG_USB_GADGET=y > CONFIG_CI_UDC=y > +CONFIG_USB_ETHER=y > CONFIG_OF_LIBFDT=y > diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig > index c30e924fb56f..eb9124ce23ec 100644 > --- a/configs/thuban_defconfig > +++ b/configs/thuban_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_USB_ETHER=y > diff --git a/configs/vinco_defconfig b/configs/vinco_defconfig > index 2cd4466a08e5..08aa8c52a254 100644 > --- a/configs/vinco_defconfig > +++ b/configs/vinco_defconfig > @@ -32,5 +32,6 @@ CONFIG_USB_EHCI_HCD=y > CONFIG_USB_STORAGE=y > CONFIG_USB_GADGET=y > CONFIG_USB_GADGET_ATMEL_USBA=y > +CONFIG_USB_ETHER=y > CONFIG_USB_HOST_ETHER=y > CONFIG_USB_ETHER_SMSC95XX=y > diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig > index f430f30bbbe5..8a3717facdbd 100644 > --- a/configs/warp7_defconfig > +++ b/configs/warp7_defconfig > @@ -38,5 +38,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y > CONFIG_G_DNL_MANUFACTURER="FSL" > CONFIG_G_DNL_VENDOR_NUM=0x0525 > CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 > +CONFIG_USB_ETHER=y > 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 96e2c9e5cfde..83a06079fdc5 100644 > --- a/configs/warp7_secure_defconfig > +++ b/configs/warp7_secure_defconfig > @@ -36,5 +36,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y > CONFIG_G_DNL_MANUFACTURER="FSL" > CONFIG_G_DNL_VENDOR_NUM=0x0525 > CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 > +CONFIG_USB_ETHER=y > CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00" > CONFIG_OF_LIBFDT=y > diff --git a/configs/xfi3_defconfig b/configs/xfi3_defconfig > index de80da69c68b..6cc78452829c 100644 > --- a/configs/xfi3_defconfig > +++ b/configs/xfi3_defconfig > @@ -31,4 +31,5 @@ CONFIG_USB=y > CONFIG_USB_EHCI_HCD=y > CONFIG_USB_GADGET=y > CONFIG_CI_UDC=y > +CONFIG_USB_ETHER=y > CONFIG_OF_LIBFDT=y > diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig > index 510efd67b9a4..ae3a37b3a935 100644 > --- a/drivers/usb/gadget/Kconfig > +++ b/drivers/usb/gadget/Kconfig > @@ -121,6 +121,18 @@ config G_DNL_PRODUCT_NUM > > endif # USB_GADGET_DOWNLOAD > > +config USB_ETHER > + bool "USB Ethernet Gadget" > + help > + Creates an Ethernet network device through a USB peripheral > + controller. This will create a network interface on both the device > + (U-Boot) and the host (remote device) that can be used just like any > + other nework interface. > + It will bind on the peripheral USB controller, ignoring the USB hosts > + controllers in the system. > + > +if USB_ETHER > + > config USBNET_DEVADDR > string "USB Gadget Ethernet device mac address" > default "de:ad:be:ef:00:01" > @@ -135,4 +147,6 @@ config USBNET_HOST_ADDR > Ethernet MAC address of the host-side (ie. remote device's) MAC > address of the usb_ether interface > > +endif # USB_ETHER > + > endif # USB_GADGET > diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h > index 7c025c7e46c8..9238c4bb769c 100644 > --- a/include/configs/am335x_evm.h > +++ b/include/configs/am335x_evm.h > @@ -264,7 +264,6 @@ > #define CONFIG_AM335X_USB1_MODE MUSB_HOST > > #ifdef CONFIG_USB_MUSB_GADGET > -#define CONFIG_USB_ETHER > #define CONFIG_USB_ETH_RNDIS > #endif /* CONFIG_USB_MUSB_GADGET */ > > diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h > index 5435ca8f4ea4..d09672770134 100644 > --- a/include/configs/am3517_evm.h > +++ b/include/configs/am3517_evm.h > @@ -80,7 +80,6 @@ > #endif /* CONFIG_USB_MUSB_HOST */ > > #ifdef CONFIG_USB_MUSB_GADGET > -#define CONFIG_USB_ETHER > #define CONFIG_USB_ETH_RNDIS > #endif /* CONFIG_USB_MUSB_GADGET */ > > diff --git a/include/configs/baltos.h b/include/configs/baltos.h > index 535fdd4373b0..380a78918f29 100644 > --- a/include/configs/baltos.h > +++ b/include/configs/baltos.h > @@ -284,7 +284,6 @@ > #define CONFIG_AM335X_USB1_MODE MUSB_OTG > > #ifdef CONFIG_USB_MUSB_GADGET > -#define CONFIG_USB_ETHER > #define CONFIG_USB_ETH_RNDIS > #endif /* CONFIG_USB_MUSB_GADGET */ > > diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h > index 9c26059a068e..f4b7a061ba12 100644 > --- a/include/configs/gw_ventana.h > +++ b/include/configs/gw_ventana.h > @@ -146,7 +146,6 @@ > #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) > #define CONFIG_MXC_USB_FLAGS 0 > #define CONFIG_USBD_HS > -#define CONFIG_USB_ETHER > #define CONFIG_USB_ETH_CDC > #define CONFIG_NETCONSOLE > > diff --git a/include/configs/h2200.h b/include/configs/h2200.h > index e956e89a89d5..24ff53f6f1e9 100644 > --- a/include/configs/h2200.h > +++ b/include/configs/h2200.h > @@ -123,7 +123,6 @@ > "bootm ; " > > #define CONFIG_USB_GADGET_PXA2XX > -#define CONFIG_USB_ETHER > #define CONFIG_USB_ETH_SUBSET > > #define CONFIG_USBNET_DEV_ADDR "de:ad:be:ef:00:01" > diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h > index 50b21c9d97a0..2ad4952f5eeb 100644 > --- a/include/configs/ma5d4evk.h > +++ b/include/configs/ma5d4evk.h > @@ -97,7 +97,6 @@ > #ifdef CONFIG_CMD_USB > > /* USB device */ > -#define CONFIG_USB_ETHER > #define CONFIG_USB_ETH_RNDIS > #define CONFIG_USBNET_MANUFACTURER "AriesEmbedded" > #define CONFIG_USB_FUNCTION_MASS_STORAGE > diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h > index d32d8f871a99..ca37f584f042 100644 > --- a/include/configs/nitrogen6x.h > +++ b/include/configs/nitrogen6x.h > @@ -19,7 +19,6 @@ > > #define CONFIG_MISC_INIT_R > #define CONFIG_USBD_HS > -#define CONFIG_USB_ETHER > #define CONFIG_USB_ETH_CDC > #define CONFIG_NETCONSOLE > > diff --git a/include/configs/novena.h b/include/configs/novena.h > index be8c6911e63a..9068ee2182e3 100644 > --- a/include/configs/novena.h > +++ b/include/configs/novena.h > @@ -129,7 +129,6 @@ > #define CONFIG_MXC_USB_FLAGS 0 > /* Gadget part */ > #define CONFIG_USBD_HS > -#define CONFIG_USB_ETHER > #define CONFIG_USB_ETH_CDC > #define CONFIG_NETCONSOLE > #endif > diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h > index ee22f4fc1bb5..ff6e86e80e9e 100644 > --- a/include/configs/omap3_beagle.h > +++ b/include/configs/omap3_beagle.h > @@ -46,7 +46,6 @@ > #define CONFIG_USB_MUSB_OMAP2PLUS > #define CONFIG_USB_MUSB_PIO_ONLY > #define CONFIG_TWL4030_USB 1 > -#define CONFIG_USB_ETHER > > /* USB EHCI */ > > diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h > index af99e8b5cb48..178e61e1b6f7 100644 > --- a/include/configs/omap3_evm.h > +++ b/include/configs/omap3_evm.h > @@ -82,7 +82,6 @@ > #define CONFIG_USB_OMAP3 > #define CONFIG_USB_MUSB_OMAP2PLUS > #define CONFIG_USB_MUSB_PIO_ONLY > -#define CONFIG_USB_ETHER > > /* USB EHCI */ > #define CONFIG_SYS_USB_FAT_BOOT_PARTITION 1 > diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h > index 5fba35668b2d..092bb73a8464 100644 > --- a/include/configs/omap3_logic.h > +++ b/include/configs/omap3_logic.h > @@ -57,7 +57,6 @@ > /* USB */ > #define CONFIG_USB_MUSB_OMAP2PLUS > #define CONFIG_USB_MUSB_PIO_ONLY > -#define CONFIG_USB_ETHER > > /* TWL4030 */ > #define CONFIG_TWL4030_USB > diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h > index f678b2944dd0..309bbd6bd36f 100644 > --- a/include/configs/pcm051.h > +++ b/include/configs/pcm051.h > @@ -134,7 +134,6 @@ > #define CONFIG_AM335X_USB1_MODE MUSB_HOST > > #ifdef CONFIG_USB_MUSB_GADGET > -#define CONFIG_USB_ETHER > #define CONFIG_USB_ETH_RNDIS > #endif /* CONFIG_USB_MUSB_GADGET */ > > diff --git a/include/configs/sama5d2_ptc.h b/include/configs/sama5d2_ptc.h > index b04781893d48..a1a0602cdd0c 100644 > --- a/include/configs/sama5d2_ptc.h > +++ b/include/configs/sama5d2_ptc.h > @@ -60,7 +60,6 @@ > #endif > > /* USB device */ > -#define CONFIG_USB_ETHER > #define CONFIG_USB_ETH_RNDIS > #define CONFIG_USBNET_MANUFACTURER "Atmel SAMA5D2_PTC" > > diff --git a/include/configs/sansa_fuze_plus.h b/include/configs/sansa_fuze_plus.h > index 250917b1dc05..9e33ca42270c 100644 > --- a/include/configs/sansa_fuze_plus.h > +++ b/include/configs/sansa_fuze_plus.h > @@ -39,7 +39,6 @@ > #define CONFIG_EHCI_MXS_PORT0 > #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 > > -#define CONFIG_USB_ETHER > #define CONFIG_USB_ETH_CDC > #define CONFIG_NETCONSOLE > #endif > diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h > index 2bcd77e9efc8..0600984f95aa 100644 > --- a/include/configs/siemens-am33x-common.h > +++ b/include/configs/siemens-am33x-common.h > @@ -179,7 +179,6 @@ > #define CONFIG_AM335X_USB1_MODE MUSB_HOST > > #ifdef CONFIG_USB_MUSB_GADGET > -#define CONFIG_USB_ETHER > #define CONFIG_USB_ETH_RNDIS > #endif /* CONFIG_USB_MUSB_GADGET */ > > diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h > index 11b909b7dd88..1a4b78674f01 100644 > --- a/include/configs/tao3530.h > +++ b/include/configs/tao3530.h > @@ -215,8 +215,6 @@ > /* USB EHCI */ > #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 162 > > -#define CONFIG_USB_ETHER > - > /* Defines for SPL */ > #define CONFIG_SPL_FRAMEWORK > #define CONFIG_SPL_NAND_SIMPLE > diff --git a/include/configs/vinco.h b/include/configs/vinco.h > index 490dc446d6d2..3b3ec6c8f2ad 100644 > --- a/include/configs/vinco.h > +++ b/include/configs/vinco.h > @@ -64,7 +64,6 @@ > #endif > > /* USB device */ > -#define CONFIG_USB_ETHER > #define CONFIG_USB_ETH_RNDIS > #define CONFIG_USBNET_MANUFACTURER "L+G VInCo" > > diff --git a/include/configs/warp7.h b/include/configs/warp7.h > index 9ce425156677..05ae3542a9ad 100644 > --- a/include/configs/warp7.h > +++ b/include/configs/warp7.h > @@ -136,7 +136,6 @@ > #define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_16M > #define DFU_DEFAULT_POLL_TIMEOUT 300 > > -#define CONFIG_USB_ETHER > #define CONFIG_USB_ETH_CDC > #define CONFIG_USB_ETH_RNDIS > #define CONFIG_USBNET_DEV_ADDR "de:ad:be:af:00:01" > diff --git a/include/configs/xfi3.h b/include/configs/xfi3.h > index 73f431681db3..7bbfd75c0cb8 100644 > --- a/include/configs/xfi3.h > +++ b/include/configs/xfi3.h > @@ -39,7 +39,6 @@ > #define CONFIG_EHCI_MXS_PORT0 > #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 > > -#define CONFIG_USB_ETHER > #define CONFIG_USB_ETH_CDC > #define CONFIG_NETCONSOLE > #endif > diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt > index 784e83c7c8a1..e9e716e7c80e 100644 > --- a/scripts/config_whitelist.txt > +++ b/scripts/config_whitelist.txt > @@ -5013,7 +5013,6 @@ CONFIG_USB_EHCI_TEGRA > CONFIG_USB_EHCI_TXFIFO_THRESH > CONFIG_USB_EHCI_VCT > CONFIG_USB_EHCI_VF > -CONFIG_USB_ETHER > CONFIG_USB_ETH_CDC > CONFIG_USB_ETH_QMULT > CONFIG_USB_ETH_RNDIS >
diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig index be057acf8634..2f075091b27a 100644 --- a/configs/am335x_baltos_defconfig +++ b/configs/am335x_baltos_defconfig @@ -63,6 +63,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_G_DNL_MANUFACTURER="Texas Instruments" CONFIG_G_DNL_VENDOR_NUM=0x0403 CONFIG_G_DNL_PRODUCT_NUM=0xbd00 +CONFIG_USB_ETHER=y 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 719d16b145eb..a3dd9b03b538 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_USB_ETHER=y CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00" CONFIG_LZO=y CONFIG_OF_LIBFDT=y diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig index 0a239bb73399..7d52382c24dc 100644 --- a/configs/am335x_boneblack_vboot_defconfig +++ b/configs/am335x_boneblack_vboot_defconfig @@ -52,4 +52,5 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_G_DNL_MANUFACTURER="Texas Instruments" CONFIG_G_DNL_VENDOR_NUM=0x0451 CONFIG_G_DNL_PRODUCT_NUM=0xd022 +CONFIG_USB_ETHER=y CONFIG_LZO=y diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig index 00c1af43449d..69b2cf3e1f61 100644 --- a/configs/am335x_evm_defconfig +++ b/configs/am335x_evm_defconfig @@ -54,6 +54,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_USB_ETHER=y CONFIG_RSA=y CONFIG_LZO=y CONFIG_OF_LIBFDT_OVERLAY=y diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig index 9f08edff4ca5..708df4284093 100644 --- a/configs/am335x_evm_nor_defconfig +++ b/configs/am335x_evm_nor_defconfig @@ -41,6 +41,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_USB_ETHER=y 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 c9eab68c8299..3f6f2798adce 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_USB_ETHER=y CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00" CONFIG_LZO=y CONFIG_OF_LIBFDT=y diff --git a/configs/am335x_evm_spiboot_defconfig b/configs/am335x_evm_spiboot_defconfig index 501fb2b90f4d..427ca371815c 100644 --- a/configs/am335x_evm_spiboot_defconfig +++ b/configs/am335x_evm_spiboot_defconfig @@ -39,6 +39,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_USB_ETHER=y CONFIG_LZO=y CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT_OVERLAY=y diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig index 7c351382d96c..a4e9e8f1b27b 100644 --- a/configs/am335x_evm_usbspl_defconfig +++ b/configs/am335x_evm_usbspl_defconfig @@ -45,6 +45,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_USB_ETHER=y CONFIG_LZO=y CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT_OVERLAY=y diff --git a/configs/am335x_hs_evm_defconfig b/configs/am335x_hs_evm_defconfig index acdd56b43558..552150732398 100644 --- a/configs/am335x_hs_evm_defconfig +++ b/configs/am335x_hs_evm_defconfig @@ -58,5 +58,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_G_DNL_MANUFACTURER="Texas Instruments" CONFIG_G_DNL_VENDOR_NUM=0x0451 CONFIG_G_DNL_PRODUCT_NUM=0xd022 +CONFIG_USB_ETHER=y CONFIG_RSA=y CONFIG_LZO=y diff --git a/configs/draco_defconfig b/configs/draco_defconfig index f5a2c1b52621..e38030bf5913 100644 --- a/configs/draco_defconfig +++ b/configs/draco_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_USB_ETHER=y diff --git a/configs/etamin_defconfig b/configs/etamin_defconfig index 148d4218c090..33ca6858abfd 100644 --- a/configs/etamin_defconfig +++ b/configs/etamin_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_USB_ETHER=y diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig index 74aa2ef56621..35d9e1ac27dc 100644 --- a/configs/gwventana_emmc_defconfig +++ b/configs/gwventana_emmc_defconfig @@ -68,6 +68,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_G_DNL_MANUFACTURER="Gateworks" CONFIG_G_DNL_VENDOR_NUM=0x0525 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 +CONFIG_USB_ETHER=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_SMSC95XX=y diff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig index 7bbdd500a78c..ca7eb5ac573e 100644 --- a/configs/gwventana_gw5904_defconfig +++ b/configs/gwventana_gw5904_defconfig @@ -72,6 +72,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_G_DNL_MANUFACTURER="Gateworks" CONFIG_G_DNL_VENDOR_NUM=0x0525 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 +CONFIG_USB_ETHER=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_SMSC95XX=y diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig index aaedf93eeac9..cb9655574888 100644 --- a/configs/gwventana_nand_defconfig +++ b/configs/gwventana_nand_defconfig @@ -71,6 +71,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_G_DNL_MANUFACTURER="Gateworks" CONFIG_G_DNL_VENDOR_NUM=0x0525 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 +CONFIG_USB_ETHER=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_SMSC95XX=y diff --git a/configs/ma5d4evk_defconfig b/configs/ma5d4evk_defconfig index 0d8c109fbcf1..0655505a1321 100644 --- a/configs/ma5d4evk_defconfig +++ b/configs/ma5d4evk_defconfig @@ -52,6 +52,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_G_DNL_MANUFACTURER="AriesEmbedded" CONFIG_G_DNL_VENDOR_NUM=0x0525 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 +CONFIG_USB_ETHER=y CONFIG_FAT_WRITE=y CONFIG_OF_LIBFDT=y # CONFIG_EFI_LOADER is not set diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig index 57aba7e6d09a..bab0d0c79f0d 100644 --- a/configs/mx6qsabrelite_defconfig +++ b/configs/mx6qsabrelite_defconfig @@ -54,5 +54,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_G_DNL_MANUFACTURER="Boundary" CONFIG_G_DNL_VENDOR_NUM=0x0525 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 +CONFIG_USB_ETHER=y # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_OF_LIBFDT=y diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig index 50e6b70bc9a0..0d19b85a30f3 100644 --- a/configs/nitrogen6dl2g_defconfig +++ b/configs/nitrogen6dl2g_defconfig @@ -51,5 +51,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_G_DNL_MANUFACTURER="Boundary" CONFIG_G_DNL_VENDOR_NUM=0x0525 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 +CONFIG_USB_ETHER=y # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_OF_LIBFDT=y diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig index 61e5ea4e21ef..a20580eb77bb 100644 --- a/configs/nitrogen6dl_defconfig +++ b/configs/nitrogen6dl_defconfig @@ -51,5 +51,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_G_DNL_MANUFACTURER="Boundary" CONFIG_G_DNL_VENDOR_NUM=0x0525 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 +CONFIG_USB_ETHER=y # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_OF_LIBFDT=y diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig index 9dbb7181ee23..940c74a5ece2 100644 --- a/configs/nitrogen6q2g_defconfig +++ b/configs/nitrogen6q2g_defconfig @@ -52,5 +52,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_G_DNL_MANUFACTURER="Boundary" CONFIG_G_DNL_VENDOR_NUM=0x0525 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 +CONFIG_USB_ETHER=y # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_OF_LIBFDT=y diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig index 5478390fd8c3..83772cb2efcf 100644 --- a/configs/nitrogen6q_defconfig +++ b/configs/nitrogen6q_defconfig @@ -52,5 +52,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_G_DNL_MANUFACTURER="Boundary" CONFIG_G_DNL_VENDOR_NUM=0x0525 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 +CONFIG_USB_ETHER=y # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_OF_LIBFDT=y diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig index 01881686429b..862b41a3f8c9 100644 --- a/configs/nitrogen6s1g_defconfig +++ b/configs/nitrogen6s1g_defconfig @@ -51,5 +51,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_G_DNL_MANUFACTURER="Boundary" CONFIG_G_DNL_VENDOR_NUM=0x0525 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 +CONFIG_USB_ETHER=y # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_OF_LIBFDT=y diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig index 51f1f91be854..e5376313b9bd 100644 --- a/configs/nitrogen6s_defconfig +++ b/configs/nitrogen6s_defconfig @@ -51,5 +51,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_G_DNL_MANUFACTURER="Boundary" CONFIG_G_DNL_VENDOR_NUM=0x0525 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 +CONFIG_USB_ETHER=y # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_OF_LIBFDT=y diff --git a/configs/novena_defconfig b/configs/novena_defconfig index 2921525f9fb0..786ab2854f70 100644 --- a/configs/novena_defconfig +++ b/configs/novena_defconfig @@ -48,6 +48,7 @@ CONFIG_USB_KEYBOARD=y CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y +CONFIG_USB_ETHER=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_SMSC95XX=y diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig index cf888f3491aa..8896b84ebc9a 100644 --- a/configs/omap3_beagle_defconfig +++ b/configs/omap3_beagle_defconfig @@ -52,6 +52,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_G_DNL_MANUFACTURER="TI" CONFIG_G_DNL_VENDOR_NUM=0x0451 CONFIG_G_DNL_PRODUCT_NUM=0xd022 +CONFIG_USB_ETHER=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_MCS7830=y diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig index 962ffa072996..8db95f167a1a 100644 --- a/configs/omap3_evm_defconfig +++ b/configs/omap3_evm_defconfig @@ -56,6 +56,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_G_DNL_MANUFACTURER="Texas Instruments" CONFIG_G_DNL_VENDOR_NUM=0x0451 CONFIG_G_DNL_PRODUCT_NUM=0x5678 +CONFIG_USB_ETHER=y CONFIG_FAT_WRITE=y CONFIG_BCH=y CONFIG_OF_LIBFDT=y diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig index 8d0a4d48e415..3bf115e6f8c8 100644 --- a/configs/omap3_logic_defconfig +++ b/configs/omap3_logic_defconfig @@ -49,4 +49,5 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_G_DNL_MANUFACTURER="TI" CONFIG_G_DNL_VENDOR_NUM=0x0451 CONFIG_G_DNL_PRODUCT_NUM=0xd022 +CONFIG_USB_ETHER=y CONFIG_BCH=y diff --git a/configs/pcm051_rev1_defconfig b/configs/pcm051_rev1_defconfig index 1683f88b690b..9b325d43ba79 100644 --- a/configs/pcm051_rev1_defconfig +++ b/configs/pcm051_rev1_defconfig @@ -60,5 +60,6 @@ CONFIG_USB_MUSB_HOST=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y +CONFIG_USB_ETHER=y CONFIG_FAT_WRITE=y CONFIG_OF_LIBFDT=y diff --git a/configs/pcm051_rev3_defconfig b/configs/pcm051_rev3_defconfig index d082bb4af204..14211ec6835e 100644 --- a/configs/pcm051_rev3_defconfig +++ b/configs/pcm051_rev3_defconfig @@ -60,5 +60,6 @@ CONFIG_USB_MUSB_HOST=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y +CONFIG_USB_ETHER=y CONFIG_FAT_WRITE=y CONFIG_OF_LIBFDT=y diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig index b1da71d4c7ed..b6624f0be16c 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_USB_ETHER=y CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00" # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_SYS_CONSOLE_BG_COL=0xff diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig index 940c4144d406..ed5f2f841b2a 100644 --- a/configs/rastaban_defconfig +++ b/configs/rastaban_defconfig @@ -70,4 +70,5 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_G_DNL_MANUFACTURER="Siemens AG" CONFIG_G_DNL_VENDOR_NUM=0x0908 CONFIG_G_DNL_PRODUCT_NUM=0x02d2 +CONFIG_USB_ETHER=y CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00" diff --git a/configs/rut_defconfig b/configs/rut_defconfig index 6ec8ff35710e..1b787906baf9 100644 --- a/configs/rut_defconfig +++ b/configs/rut_defconfig @@ -75,6 +75,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_USB_ETHER=y # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_SYS_CONSOLE_BG_COL=0xff CONFIG_SYS_CONSOLE_FG_COL=0x00 diff --git a/configs/sama5d2_ptc_nandflash_defconfig b/configs/sama5d2_ptc_nandflash_defconfig index bca3ac2fcbfc..6672a5ce11f7 100644 --- a/configs/sama5d2_ptc_nandflash_defconfig +++ b/configs/sama5d2_ptc_nandflash_defconfig @@ -30,3 +30,4 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_ATMEL_USBA=y +CONFIG_USB_ETHER=y diff --git a/configs/sama5d2_ptc_spiflash_defconfig b/configs/sama5d2_ptc_spiflash_defconfig index e4fb49f6627d..9a23a808f1b3 100644 --- a/configs/sama5d2_ptc_spiflash_defconfig +++ b/configs/sama5d2_ptc_spiflash_defconfig @@ -31,3 +31,4 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_ATMEL_USBA=y +CONFIG_USB_ETHER=y diff --git a/configs/sansa_fuze_plus_defconfig b/configs/sansa_fuze_plus_defconfig index f6ce09c366b4..c6d50ccb8e15 100644 --- a/configs/sansa_fuze_plus_defconfig +++ b/configs/sansa_fuze_plus_defconfig @@ -32,4 +32,5 @@ CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y +CONFIG_USB_ETHER=y CONFIG_OF_LIBFDT=y diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig index c30e924fb56f..eb9124ce23ec 100644 --- a/configs/thuban_defconfig +++ b/configs/thuban_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_USB_ETHER=y diff --git a/configs/vinco_defconfig b/configs/vinco_defconfig index 2cd4466a08e5..08aa8c52a254 100644 --- a/configs/vinco_defconfig +++ b/configs/vinco_defconfig @@ -32,5 +32,6 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_ATMEL_USBA=y +CONFIG_USB_ETHER=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_SMSC95XX=y diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig index f430f30bbbe5..8a3717facdbd 100644 --- a/configs/warp7_defconfig +++ b/configs/warp7_defconfig @@ -38,5 +38,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_G_DNL_MANUFACTURER="FSL" CONFIG_G_DNL_VENDOR_NUM=0x0525 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 +CONFIG_USB_ETHER=y 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 96e2c9e5cfde..83a06079fdc5 100644 --- a/configs/warp7_secure_defconfig +++ b/configs/warp7_secure_defconfig @@ -36,5 +36,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_G_DNL_MANUFACTURER="FSL" CONFIG_G_DNL_VENDOR_NUM=0x0525 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 +CONFIG_USB_ETHER=y CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00" CONFIG_OF_LIBFDT=y diff --git a/configs/xfi3_defconfig b/configs/xfi3_defconfig index de80da69c68b..6cc78452829c 100644 --- a/configs/xfi3_defconfig +++ b/configs/xfi3_defconfig @@ -31,4 +31,5 @@ CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y +CONFIG_USB_ETHER=y CONFIG_OF_LIBFDT=y diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index 510efd67b9a4..ae3a37b3a935 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig @@ -121,6 +121,18 @@ config G_DNL_PRODUCT_NUM endif # USB_GADGET_DOWNLOAD +config USB_ETHER + bool "USB Ethernet Gadget" + help + Creates an Ethernet network device through a USB peripheral + controller. This will create a network interface on both the device + (U-Boot) and the host (remote device) that can be used just like any + other nework interface. + It will bind on the peripheral USB controller, ignoring the USB hosts + controllers in the system. + +if USB_ETHER + config USBNET_DEVADDR string "USB Gadget Ethernet device mac address" default "de:ad:be:ef:00:01" @@ -135,4 +147,6 @@ config USBNET_HOST_ADDR Ethernet MAC address of the host-side (ie. remote device's) MAC address of the usb_ether interface +endif # USB_ETHER + endif # USB_GADGET diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 7c025c7e46c8..9238c4bb769c 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -264,7 +264,6 @@ #define CONFIG_AM335X_USB1_MODE MUSB_HOST #ifdef CONFIG_USB_MUSB_GADGET -#define CONFIG_USB_ETHER #define CONFIG_USB_ETH_RNDIS #endif /* CONFIG_USB_MUSB_GADGET */ diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 5435ca8f4ea4..d09672770134 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -80,7 +80,6 @@ #endif /* CONFIG_USB_MUSB_HOST */ #ifdef CONFIG_USB_MUSB_GADGET -#define CONFIG_USB_ETHER #define CONFIG_USB_ETH_RNDIS #endif /* CONFIG_USB_MUSB_GADGET */ diff --git a/include/configs/baltos.h b/include/configs/baltos.h index 535fdd4373b0..380a78918f29 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -284,7 +284,6 @@ #define CONFIG_AM335X_USB1_MODE MUSB_OTG #ifdef CONFIG_USB_MUSB_GADGET -#define CONFIG_USB_ETHER #define CONFIG_USB_ETH_RNDIS #endif /* CONFIG_USB_MUSB_GADGET */ diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 9c26059a068e..f4b7a061ba12 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -146,7 +146,6 @@ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_USBD_HS -#define CONFIG_USB_ETHER #define CONFIG_USB_ETH_CDC #define CONFIG_NETCONSOLE diff --git a/include/configs/h2200.h b/include/configs/h2200.h index e956e89a89d5..24ff53f6f1e9 100644 --- a/include/configs/h2200.h +++ b/include/configs/h2200.h @@ -123,7 +123,6 @@ "bootm ; " #define CONFIG_USB_GADGET_PXA2XX -#define CONFIG_USB_ETHER #define CONFIG_USB_ETH_SUBSET #define CONFIG_USBNET_DEV_ADDR "de:ad:be:ef:00:01" diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h index 50b21c9d97a0..2ad4952f5eeb 100644 --- a/include/configs/ma5d4evk.h +++ b/include/configs/ma5d4evk.h @@ -97,7 +97,6 @@ #ifdef CONFIG_CMD_USB /* USB device */ -#define CONFIG_USB_ETHER #define CONFIG_USB_ETH_RNDIS #define CONFIG_USBNET_MANUFACTURER "AriesEmbedded" #define CONFIG_USB_FUNCTION_MASS_STORAGE diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index d32d8f871a99..ca37f584f042 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -19,7 +19,6 @@ #define CONFIG_MISC_INIT_R #define CONFIG_USBD_HS -#define CONFIG_USB_ETHER #define CONFIG_USB_ETH_CDC #define CONFIG_NETCONSOLE diff --git a/include/configs/novena.h b/include/configs/novena.h index be8c6911e63a..9068ee2182e3 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -129,7 +129,6 @@ #define CONFIG_MXC_USB_FLAGS 0 /* Gadget part */ #define CONFIG_USBD_HS -#define CONFIG_USB_ETHER #define CONFIG_USB_ETH_CDC #define CONFIG_NETCONSOLE #endif diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index ee22f4fc1bb5..ff6e86e80e9e 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -46,7 +46,6 @@ #define CONFIG_USB_MUSB_OMAP2PLUS #define CONFIG_USB_MUSB_PIO_ONLY #define CONFIG_TWL4030_USB 1 -#define CONFIG_USB_ETHER /* USB EHCI */ diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index af99e8b5cb48..178e61e1b6f7 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -82,7 +82,6 @@ #define CONFIG_USB_OMAP3 #define CONFIG_USB_MUSB_OMAP2PLUS #define CONFIG_USB_MUSB_PIO_ONLY -#define CONFIG_USB_ETHER /* USB EHCI */ #define CONFIG_SYS_USB_FAT_BOOT_PARTITION 1 diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index 5fba35668b2d..092bb73a8464 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -57,7 +57,6 @@ /* USB */ #define CONFIG_USB_MUSB_OMAP2PLUS #define CONFIG_USB_MUSB_PIO_ONLY -#define CONFIG_USB_ETHER /* TWL4030 */ #define CONFIG_TWL4030_USB diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h index f678b2944dd0..309bbd6bd36f 100644 --- a/include/configs/pcm051.h +++ b/include/configs/pcm051.h @@ -134,7 +134,6 @@ #define CONFIG_AM335X_USB1_MODE MUSB_HOST #ifdef CONFIG_USB_MUSB_GADGET -#define CONFIG_USB_ETHER #define CONFIG_USB_ETH_RNDIS #endif /* CONFIG_USB_MUSB_GADGET */ diff --git a/include/configs/sama5d2_ptc.h b/include/configs/sama5d2_ptc.h index b04781893d48..a1a0602cdd0c 100644 --- a/include/configs/sama5d2_ptc.h +++ b/include/configs/sama5d2_ptc.h @@ -60,7 +60,6 @@ #endif /* USB device */ -#define CONFIG_USB_ETHER #define CONFIG_USB_ETH_RNDIS #define CONFIG_USBNET_MANUFACTURER "Atmel SAMA5D2_PTC" diff --git a/include/configs/sansa_fuze_plus.h b/include/configs/sansa_fuze_plus.h index 250917b1dc05..9e33ca42270c 100644 --- a/include/configs/sansa_fuze_plus.h +++ b/include/configs/sansa_fuze_plus.h @@ -39,7 +39,6 @@ #define CONFIG_EHCI_MXS_PORT0 #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 -#define CONFIG_USB_ETHER #define CONFIG_USB_ETH_CDC #define CONFIG_NETCONSOLE #endif diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 2bcd77e9efc8..0600984f95aa 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -179,7 +179,6 @@ #define CONFIG_AM335X_USB1_MODE MUSB_HOST #ifdef CONFIG_USB_MUSB_GADGET -#define CONFIG_USB_ETHER #define CONFIG_USB_ETH_RNDIS #endif /* CONFIG_USB_MUSB_GADGET */ diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index 11b909b7dd88..1a4b78674f01 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -215,8 +215,6 @@ /* USB EHCI */ #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 162 -#define CONFIG_USB_ETHER - /* Defines for SPL */ #define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_NAND_SIMPLE diff --git a/include/configs/vinco.h b/include/configs/vinco.h index 490dc446d6d2..3b3ec6c8f2ad 100644 --- a/include/configs/vinco.h +++ b/include/configs/vinco.h @@ -64,7 +64,6 @@ #endif /* USB device */ -#define CONFIG_USB_ETHER #define CONFIG_USB_ETH_RNDIS #define CONFIG_USBNET_MANUFACTURER "L+G VInCo" diff --git a/include/configs/warp7.h b/include/configs/warp7.h index 9ce425156677..05ae3542a9ad 100644 --- a/include/configs/warp7.h +++ b/include/configs/warp7.h @@ -136,7 +136,6 @@ #define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_16M #define DFU_DEFAULT_POLL_TIMEOUT 300 -#define CONFIG_USB_ETHER #define CONFIG_USB_ETH_CDC #define CONFIG_USB_ETH_RNDIS #define CONFIG_USBNET_DEV_ADDR "de:ad:be:af:00:01" diff --git a/include/configs/xfi3.h b/include/configs/xfi3.h index 73f431681db3..7bbfd75c0cb8 100644 --- a/include/configs/xfi3.h +++ b/include/configs/xfi3.h @@ -39,7 +39,6 @@ #define CONFIG_EHCI_MXS_PORT0 #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 -#define CONFIG_USB_ETHER #define CONFIG_USB_ETH_CDC #define CONFIG_NETCONSOLE #endif diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 784e83c7c8a1..e9e716e7c80e 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -5013,7 +5013,6 @@ CONFIG_USB_EHCI_TEGRA CONFIG_USB_EHCI_TXFIFO_THRESH CONFIG_USB_EHCI_VCT CONFIG_USB_EHCI_VF -CONFIG_USB_ETHER CONFIG_USB_ETH_CDC CONFIG_USB_ETH_QMULT CONFIG_USB_ETH_RNDIS
The USB Ethernet gadget option has not yet been moved to Kconfig, let's deal with that. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- configs/am335x_baltos_defconfig | 1 + configs/am335x_boneblack_defconfig | 1 + configs/am335x_boneblack_vboot_defconfig | 1 + configs/am335x_evm_defconfig | 1 + configs/am335x_evm_nor_defconfig | 1 + configs/am335x_evm_norboot_defconfig | 1 + configs/am335x_evm_spiboot_defconfig | 1 + configs/am335x_evm_usbspl_defconfig | 1 + configs/am335x_hs_evm_defconfig | 1 + configs/draco_defconfig | 1 + configs/etamin_defconfig | 1 + configs/gwventana_emmc_defconfig | 1 + configs/gwventana_gw5904_defconfig | 1 + configs/gwventana_nand_defconfig | 1 + configs/ma5d4evk_defconfig | 1 + configs/mx6qsabrelite_defconfig | 1 + configs/nitrogen6dl2g_defconfig | 1 + configs/nitrogen6dl_defconfig | 1 + configs/nitrogen6q2g_defconfig | 1 + configs/nitrogen6q_defconfig | 1 + configs/nitrogen6s1g_defconfig | 1 + configs/nitrogen6s_defconfig | 1 + configs/novena_defconfig | 1 + configs/omap3_beagle_defconfig | 1 + configs/omap3_evm_defconfig | 1 + configs/omap3_logic_defconfig | 1 + configs/pcm051_rev1_defconfig | 1 + configs/pcm051_rev3_defconfig | 1 + configs/pxm2_defconfig | 1 + configs/rastaban_defconfig | 1 + configs/rut_defconfig | 1 + configs/sama5d2_ptc_nandflash_defconfig | 1 + configs/sama5d2_ptc_spiflash_defconfig | 1 + configs/sansa_fuze_plus_defconfig | 1 + configs/thuban_defconfig | 1 + configs/vinco_defconfig | 1 + configs/warp7_defconfig | 1 + configs/warp7_secure_defconfig | 1 + configs/xfi3_defconfig | 1 + drivers/usb/gadget/Kconfig | 14 ++++++++++++++ include/configs/am335x_evm.h | 1 - include/configs/am3517_evm.h | 1 - include/configs/baltos.h | 1 - include/configs/gw_ventana.h | 1 - include/configs/h2200.h | 1 - include/configs/ma5d4evk.h | 1 - include/configs/nitrogen6x.h | 1 - include/configs/novena.h | 1 - include/configs/omap3_beagle.h | 1 - include/configs/omap3_evm.h | 1 - include/configs/omap3_logic.h | 1 - include/configs/pcm051.h | 1 - include/configs/sama5d2_ptc.h | 1 - include/configs/sansa_fuze_plus.h | 1 - include/configs/siemens-am33x-common.h | 1 - include/configs/tao3530.h | 2 -- include/configs/vinco.h | 1 - include/configs/warp7.h | 1 - include/configs/xfi3.h | 1 - scripts/config_whitelist.txt | 1 - 60 files changed, 53 insertions(+), 21 deletions(-)