[U-Boot] [PATCH] Convert CONFIG_USB_ETHER et al to Kconfig

Gregory CLEMENT gregory.clement at free-electrons.com
Thu Jul 27 11:39:36 UTC 2017


Hi Adam,
 
 On mer., juil. 26 2017, Adam Ford <aford173 at gmail.com> wrote:

> This converts the following to Kconfig:
>    CONFIG_USB_ETHER
>    CONFIG_USB_ETHER_RNDIS
>
> Signed-off-by: Adam Ford <aford173 at gmail.com>

For the VInCo platform

Acked-by: Gregory CLEMENT <gregory.clement at free-electrons.com>

Thanks,

Gregory


>
> diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig
> index 09e028f..a25d24f 100644
> --- a/configs/am335x_baltos_defconfig
> +++ b/configs/am335x_baltos_defconfig
> @@ -57,6 +57,7 @@ CONFIG_USB_MUSB_HOST=y
>  CONFIG_USB_MUSB_GADGET=y
>  CONFIG_USB_STORAGE=y
>  CONFIG_USB_GADGET=y
> +CONFIG_USB_ETHER=y
>  CONFIG_USB_GADGET_DOWNLOAD=y
>  CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
>  CONFIG_G_DNL_VENDOR_NUM=0x0403
> diff --git a/configs/am335x_boneblack_defconfig b/configs/am335x_boneblack_defconfig
> index 516ad70..1e360fd 100644
> --- a/configs/am335x_boneblack_defconfig
> +++ b/configs/am335x_boneblack_defconfig
> @@ -37,6 +37,7 @@ CONFIG_USB_MUSB_HOST=y
>  CONFIG_USB_MUSB_GADGET=y
>  CONFIG_USB_STORAGE=y
>  CONFIG_USB_GADGET=y
> +CONFIG_USB_ETHER=y
>  CONFIG_USB_GADGET_DOWNLOAD=y
>  CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
>  CONFIG_G_DNL_VENDOR_NUM=0x0451
> diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig
> index 33da1fa..3c53891 100644
> --- a/configs/am335x_boneblack_vboot_defconfig
> +++ b/configs/am335x_boneblack_vboot_defconfig
> @@ -46,6 +46,7 @@ CONFIG_USB_MUSB_HOST=y
>  CONFIG_USB_MUSB_GADGET=y
>  CONFIG_USB_STORAGE=y
>  CONFIG_USB_GADGET=y
> +CONFIG_USB_ETHER=y
>  CONFIG_USB_GADGET_DOWNLOAD=y
>  CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
>  CONFIG_G_DNL_VENDOR_NUM=0x0451
> diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig
> index 4ea5617..6e246a0 100644
> --- a/configs/am335x_evm_defconfig
> +++ b/configs/am335x_evm_defconfig
> @@ -47,6 +47,7 @@ CONFIG_USB_MUSB_GADGET=y
>  CONFIG_USB_MUSB_TI=y
>  CONFIG_USB_STORAGE=y
>  CONFIG_USB_GADGET=y
> +CONFIG_USB_ETHER=y
>  CONFIG_USB_GADGET_DOWNLOAD=y
>  CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
>  CONFIG_G_DNL_VENDOR_NUM=0x0451
> diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig
> index 49040a6..2220311 100644
> --- a/configs/am335x_evm_nor_defconfig
> +++ b/configs/am335x_evm_nor_defconfig
> @@ -46,6 +46,7 @@ CONFIG_USB_MUSB_HOST=y
>  CONFIG_USB_MUSB_GADGET=y
>  CONFIG_USB_STORAGE=y
>  CONFIG_USB_GADGET=y
> +CONFIG_USB_ETHER=y
>  CONFIG_USB_GADGET_DOWNLOAD=y
>  CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
>  CONFIG_G_DNL_VENDOR_NUM=0x0451
> diff --git a/configs/am335x_evm_norboot_defconfig b/configs/am335x_evm_norboot_defconfig
> index f121e2f..2135d60 100644
> --- a/configs/am335x_evm_norboot_defconfig
> +++ b/configs/am335x_evm_norboot_defconfig
> @@ -30,6 +30,7 @@ CONFIG_USB_MUSB_HOST=y
>  CONFIG_USB_MUSB_GADGET=y
>  CONFIG_USB_STORAGE=y
>  CONFIG_USB_GADGET=y
> +CONFIG_USB_ETHER=y
>  CONFIG_USB_GADGET_DOWNLOAD=y
>  CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
>  CONFIG_G_DNL_VENDOR_NUM=0x0451
> diff --git a/configs/am335x_evm_spiboot_defconfig b/configs/am335x_evm_spiboot_defconfig
> index 5cbfa8e..2f736d5 100644
> --- a/configs/am335x_evm_spiboot_defconfig
> +++ b/configs/am335x_evm_spiboot_defconfig
> @@ -35,6 +35,7 @@ CONFIG_USB_MUSB_HOST=y
>  CONFIG_USB_MUSB_GADGET=y
>  CONFIG_USB_STORAGE=y
>  CONFIG_USB_GADGET=y
> +CONFIG_USB_ETHER=y
>  CONFIG_USB_GADGET_DOWNLOAD=y
>  CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
>  CONFIG_G_DNL_VENDOR_NUM=0x0451
> diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig
> index 51d1042..cdf398a 100644
> --- a/configs/am335x_evm_usbspl_defconfig
> +++ b/configs/am335x_evm_usbspl_defconfig
> @@ -38,6 +38,7 @@ CONFIG_USB_MUSB_HOST=y
>  CONFIG_USB_MUSB_GADGET=y
>  CONFIG_USB_STORAGE=y
>  CONFIG_USB_GADGET=y
> +CONFIG_USB_ETHER=y
>  CONFIG_USB_GADGET_DOWNLOAD=y
>  CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
>  CONFIG_G_DNL_VENDOR_NUM=0x0451
> diff --git a/configs/am335x_hs_evm_defconfig b/configs/am335x_hs_evm_defconfig
> index 2b1acb7..979af8b 100644
> --- a/configs/am335x_hs_evm_defconfig
> +++ b/configs/am335x_hs_evm_defconfig
> @@ -49,6 +49,7 @@ CONFIG_USB_MUSB_GADGET=y
>  CONFIG_USB_MUSB_TI=y
>  CONFIG_USB_STORAGE=y
>  CONFIG_USB_GADGET=y
> +CONFIG_USB_ETHER=y
>  CONFIG_USB_GADGET_DOWNLOAD=y
>  CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
>  CONFIG_G_DNL_VENDOR_NUM=0x0451
> diff --git a/configs/draco_defconfig b/configs/draco_defconfig
> index 763e96b..30e1532 100644
> --- a/configs/draco_defconfig
> +++ b/configs/draco_defconfig
> @@ -61,6 +61,7 @@ CONFIG_USB_MUSB_HOST=y
>  CONFIG_USB_MUSB_GADGET=y
>  CONFIG_USB_STORAGE=y
>  CONFIG_USB_GADGET=y
> +CONFIG_USB_ETHER=y
>  CONFIG_USB_GADGET_DOWNLOAD=y
>  CONFIG_G_DNL_MANUFACTURER="Siemens AG"
>  CONFIG_G_DNL_VENDOR_NUM=0x0908
> diff --git a/configs/etamin_defconfig b/configs/etamin_defconfig
> index ab3ef75..c1f6a29 100644
> --- a/configs/etamin_defconfig
> +++ b/configs/etamin_defconfig
> @@ -61,6 +61,7 @@ CONFIG_USB_MUSB_HOST=y
>  CONFIG_USB_MUSB_GADGET=y
>  CONFIG_USB_STORAGE=y
>  CONFIG_USB_GADGET=y
> +CONFIG_USB_ETHER=y
>  CONFIG_USB_GADGET_DOWNLOAD=y
>  CONFIG_G_DNL_MANUFACTURER="Siemens AG"
>  CONFIG_G_DNL_VENDOR_NUM=0x0908
> diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig
> index cdf3e92..780b996 100644
> --- a/configs/gwventana_emmc_defconfig
> +++ b/configs/gwventana_emmc_defconfig
> @@ -59,6 +59,7 @@ CONFIG_USB=y
>  CONFIG_USB_STORAGE=y
>  CONFIG_USB_KEYBOARD=y
>  CONFIG_USB_GADGET=y
> +CONFIG_USB_ETHER=y
>  CONFIG_CI_UDC=y
>  CONFIG_USB_GADGET_DOWNLOAD=y
>  CONFIG_G_DNL_MANUFACTURER="Gateworks"
> diff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig
> index c5b5232..5bd46ce 100644
> --- a/configs/gwventana_gw5904_defconfig
> +++ b/configs/gwventana_gw5904_defconfig
> @@ -63,6 +63,7 @@ CONFIG_USB=y
>  CONFIG_USB_STORAGE=y
>  CONFIG_USB_KEYBOARD=y
>  CONFIG_USB_GADGET=y
> +CONFIG_USB_ETHER=y
>  CONFIG_CI_UDC=y
>  CONFIG_USB_GADGET_DOWNLOAD=y
>  CONFIG_G_DNL_MANUFACTURER="Gateworks"
> diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig
> index 2de3355..f96cd00 100644
> --- a/configs/gwventana_nand_defconfig
> +++ b/configs/gwventana_nand_defconfig
> @@ -60,6 +60,7 @@ CONFIG_USB=y
>  CONFIG_USB_STORAGE=y
>  CONFIG_USB_KEYBOARD=y
>  CONFIG_USB_GADGET=y
> +CONFIG_USB_ETHER=y
>  CONFIG_CI_UDC=y
>  CONFIG_USB_GADGET_DOWNLOAD=y
>  CONFIG_G_DNL_MANUFACTURER="Gateworks"
> diff --git a/configs/ma5d4evk_defconfig b/configs/ma5d4evk_defconfig
> index c18f759..7a878dc 100644
> --- a/configs/ma5d4evk_defconfig
> +++ b/configs/ma5d4evk_defconfig
> @@ -45,6 +45,7 @@ CONFIG_USB=y
>  CONFIG_USB_EHCI_HCD=y
>  CONFIG_USB_STORAGE=y
>  CONFIG_USB_GADGET=y
> +CONFIG_USB_ETHER=y
>  CONFIG_USB_GADGET_ATMEL_USBA=y
>  CONFIG_USB_GADGET_DOWNLOAD=y
>  CONFIG_G_DNL_MANUFACTURER="AriesEmbedded"
> diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig
> index 47c2b15..30ceb60 100644
> --- a/configs/mx6qsabrelite_defconfig
> +++ b/configs/mx6qsabrelite_defconfig
> @@ -40,6 +40,7 @@ CONFIG_USB=y
>  CONFIG_USB_STORAGE=y
>  CONFIG_USB_KEYBOARD=y
>  CONFIG_USB_GADGET=y
> +CONFIG_USB_ETHER=y
>  CONFIG_CI_UDC=y
>  CONFIG_USB_GADGET_DOWNLOAD=y
>  CONFIG_G_DNL_MANUFACTURER="Boundary"
> diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig
> index 9b8914b..420efb6 100644
> --- a/configs/nitrogen6dl2g_defconfig
> +++ b/configs/nitrogen6dl2g_defconfig
> @@ -37,6 +37,7 @@ CONFIG_USB=y
>  CONFIG_USB_STORAGE=y
>  CONFIG_USB_KEYBOARD=y
>  CONFIG_USB_GADGET=y
> +CONFIG_USB_ETHER=y
>  CONFIG_CI_UDC=y
>  CONFIG_USB_GADGET_DOWNLOAD=y
>  CONFIG_G_DNL_MANUFACTURER="Boundary"
> diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig
> index 21a8f3a..679eba4 100644
> --- a/configs/nitrogen6dl_defconfig
> +++ b/configs/nitrogen6dl_defconfig
> @@ -37,6 +37,7 @@ CONFIG_USB=y
>  CONFIG_USB_STORAGE=y
>  CONFIG_USB_KEYBOARD=y
>  CONFIG_USB_GADGET=y
> +CONFIG_USB_ETHER=y
>  CONFIG_CI_UDC=y
>  CONFIG_USB_GADGET_DOWNLOAD=y
>  CONFIG_G_DNL_MANUFACTURER="Boundary"
> diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig
> index 5c11254..9af99de 100644
> --- a/configs/nitrogen6q2g_defconfig
> +++ b/configs/nitrogen6q2g_defconfig
> @@ -38,6 +38,7 @@ CONFIG_USB=y
>  CONFIG_USB_STORAGE=y
>  CONFIG_USB_KEYBOARD=y
>  CONFIG_USB_GADGET=y
> +CONFIG_USB_ETHER=y
>  CONFIG_CI_UDC=y
>  CONFIG_USB_GADGET_DOWNLOAD=y
>  CONFIG_G_DNL_MANUFACTURER="Boundary"
> diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig
> index 33c9cdb..2a8a6c6 100644
> --- a/configs/nitrogen6q_defconfig
> +++ b/configs/nitrogen6q_defconfig
> @@ -38,6 +38,7 @@ CONFIG_USB=y
>  CONFIG_USB_STORAGE=y
>  CONFIG_USB_KEYBOARD=y
>  CONFIG_USB_GADGET=y
> +CONFIG_USB_ETHER=y
>  CONFIG_CI_UDC=y
>  CONFIG_USB_GADGET_DOWNLOAD=y
>  CONFIG_G_DNL_MANUFACTURER="Boundary"
> diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig
> index 944afc5..f2c044b 100644
> --- a/configs/nitrogen6s1g_defconfig
> +++ b/configs/nitrogen6s1g_defconfig
> @@ -37,6 +37,7 @@ CONFIG_USB=y
>  CONFIG_USB_STORAGE=y
>  CONFIG_USB_KEYBOARD=y
>  CONFIG_USB_GADGET=y
> +CONFIG_USB_ETHER=y
>  CONFIG_CI_UDC=y
>  CONFIG_USB_GADGET_DOWNLOAD=y
>  CONFIG_G_DNL_MANUFACTURER="Boundary"
> diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig
> index e8c1968..8cffa61 100644
> --- a/configs/nitrogen6s_defconfig
> +++ b/configs/nitrogen6s_defconfig
> @@ -37,6 +37,7 @@ CONFIG_USB=y
>  CONFIG_USB_STORAGE=y
>  CONFIG_USB_KEYBOARD=y
>  CONFIG_USB_GADGET=y
> +CONFIG_USB_ETHER=y
>  CONFIG_CI_UDC=y
>  CONFIG_USB_GADGET_DOWNLOAD=y
>  CONFIG_G_DNL_MANUFACTURER="Boundary"
> diff --git a/configs/novena_defconfig b/configs/novena_defconfig
> index 23c186b..9cc66aa 100644
> --- a/configs/novena_defconfig
> +++ b/configs/novena_defconfig
> @@ -39,6 +39,7 @@ CONFIG_USB=y
>  CONFIG_USB_STORAGE=y
>  CONFIG_USB_KEYBOARD=y
>  CONFIG_USB_GADGET=y
> +CONFIG_USB_ETHER=y
>  CONFIG_CI_UDC=y
>  # CONFIG_VIDEO_SW_CURSOR is not set
>  CONFIG_FAT_WRITE=y
> diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig
> index 72a4ef1..335b325 100644
> --- a/configs/omap3_beagle_defconfig
> +++ b/configs/omap3_beagle_defconfig
> @@ -39,6 +39,7 @@ CONFIG_USB_EHCI_HCD=y
>  CONFIG_USB_MUSB_GADGET=y
>  CONFIG_USB_STORAGE=y
>  CONFIG_USB_GADGET=y
> +CONFIG_USB_ETHER_RNDIS=y
>  CONFIG_USB_GADGET_DOWNLOAD=y
>  CONFIG_G_DNL_MANUFACTURER="TI"
>  CONFIG_G_DNL_VENDOR_NUM=0x0451
> diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig
> index 58b5ecd..ba63e57 100644
> --- a/configs/omap3_logic_defconfig
> +++ b/configs/omap3_logic_defconfig
> @@ -35,6 +35,7 @@ CONFIG_SYS_NS16550=y
>  CONFIG_USB=y
>  CONFIG_USB_MUSB_GADGET=y
>  CONFIG_USB_GADGET=y
> +CONFIG_USB_ETHER_RNDIS=y
>  CONFIG_USB_GADGET_DOWNLOAD=y
>  CONFIG_G_DNL_MANUFACTURER="TI"
>  CONFIG_G_DNL_VENDOR_NUM=0x0451
> diff --git a/configs/pcm051_rev1_defconfig b/configs/pcm051_rev1_defconfig
> index 6571876..71354dd 100644
> --- a/configs/pcm051_rev1_defconfig
> +++ b/configs/pcm051_rev1_defconfig
> @@ -58,5 +58,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 a622359..85fe44e 100644
> --- a/configs/pcm051_rev3_defconfig
> +++ b/configs/pcm051_rev3_defconfig
> @@ -58,5 +58,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 ac2d4bb..8b329d5 100644
> --- a/configs/pxm2_defconfig
> +++ b/configs/pxm2_defconfig
> @@ -65,6 +65,7 @@ CONFIG_USB_MUSB_HOST=y
>  CONFIG_USB_MUSB_GADGET=y
>  CONFIG_USB_STORAGE=y
>  CONFIG_USB_GADGET=y
> +CONFIG_USB_ETHER=y
>  CONFIG_USB_GADGET_DOWNLOAD=y
>  CONFIG_G_DNL_MANUFACTURER="Siemens AG"
>  CONFIG_G_DNL_VENDOR_NUM=0x0908
> diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig
> index cc40f91..5997efd 100644
> --- a/configs/rastaban_defconfig
> +++ b/configs/rastaban_defconfig
> @@ -61,6 +61,7 @@ CONFIG_USB_MUSB_HOST=y
>  CONFIG_USB_MUSB_GADGET=y
>  CONFIG_USB_STORAGE=y
>  CONFIG_USB_GADGET=y
> +CONFIG_USB_ETHER=y
>  CONFIG_USB_GADGET_DOWNLOAD=y
>  CONFIG_G_DNL_MANUFACTURER="Siemens AG"
>  CONFIG_G_DNL_VENDOR_NUM=0x0908
> diff --git a/configs/rut_defconfig b/configs/rut_defconfig
> index 9220458..d55920f 100644
> --- a/configs/rut_defconfig
> +++ b/configs/rut_defconfig
> @@ -66,6 +66,7 @@ CONFIG_USB_MUSB_HOST=y
>  CONFIG_USB_MUSB_GADGET=y
>  CONFIG_USB_STORAGE=y
>  CONFIG_USB_GADGET=y
> +CONFIG_USB_ETHER=y
>  CONFIG_USB_GADGET_DOWNLOAD=y
>  CONFIG_G_DNL_MANUFACTURER="Siemens AG"
>  CONFIG_G_DNL_VENDOR_NUM=0x0908
> diff --git a/configs/sansa_fuze_plus_defconfig b/configs/sansa_fuze_plus_defconfig
> index 0da8d52..f4f62d6 100644
> --- a/configs/sansa_fuze_plus_defconfig
> +++ b/configs/sansa_fuze_plus_defconfig
> @@ -30,5 +30,6 @@ CONFIG_MMC_MXS=y
>  CONFIG_USB=y
>  CONFIG_USB_EHCI_HCD=y
>  CONFIG_USB_GADGET=y
> +CONFIG_USB_ETHER=y
>  CONFIG_CI_UDC=y
>  CONFIG_OF_LIBFDT=y
> diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig
> index e4e99be..b6b0870 100644
> --- a/configs/thuban_defconfig
> +++ b/configs/thuban_defconfig
> @@ -61,6 +61,7 @@ CONFIG_USB_MUSB_HOST=y
>  CONFIG_USB_MUSB_GADGET=y
>  CONFIG_USB_STORAGE=y
>  CONFIG_USB_GADGET=y
> +CONFIG_USB_ETHER=y
>  CONFIG_USB_GADGET_DOWNLOAD=y
>  CONFIG_G_DNL_MANUFACTURER="Siemens AG"
>  CONFIG_G_DNL_VENDOR_NUM=0x0908
> diff --git a/configs/vinco_defconfig b/configs/vinco_defconfig
> index cb2040e..b60e027 100644
> --- a/configs/vinco_defconfig
> +++ b/configs/vinco_defconfig
> @@ -29,4 +29,5 @@ CONFIG_USB=y
>  CONFIG_USB_EHCI_HCD=y
>  CONFIG_USB_STORAGE=y
>  CONFIG_USB_GADGET=y
> +CONFIG_USB_ETHER_RNDIS=y
>  CONFIG_USB_GADGET_ATMEL_USBA=y
> diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig
> index db1c7cb..998a61f 100644
> --- a/configs/warp7_defconfig
> +++ b/configs/warp7_defconfig
> @@ -33,6 +33,7 @@ CONFIG_USB_EHCI_HCD=y
>  CONFIG_MXC_USB_OTG_HACTIVE=y
>  CONFIG_USB_STORAGE=y
>  CONFIG_USB_GADGET=y
> +CONFIG_USB_ETHER=y
>  CONFIG_CI_UDC=y
>  CONFIG_USB_GADGET_DOWNLOAD=y
>  CONFIG_G_DNL_MANUFACTURER="FSL"
> diff --git a/configs/warp7_secure_defconfig b/configs/warp7_secure_defconfig
> index b80e1a6..06f13da 100644
> --- a/configs/warp7_secure_defconfig
> +++ b/configs/warp7_secure_defconfig
> @@ -31,6 +31,7 @@ CONFIG_USB=y
>  CONFIG_USB_EHCI_HCD=y
>  CONFIG_MXC_USB_OTG_HACTIVE=y
>  CONFIG_USB_GADGET=y
> +CONFIG_USB_ETHER=y
>  CONFIG_CI_UDC=y
>  CONFIG_USB_GADGET_DOWNLOAD=y
>  CONFIG_G_DNL_MANUFACTURER="FSL"
> diff --git a/configs/xfi3_defconfig b/configs/xfi3_defconfig
> index 5a49db2..04438f8 100644
> --- a/configs/xfi3_defconfig
> +++ b/configs/xfi3_defconfig
> @@ -29,5 +29,6 @@ CONFIG_MMC_MXS=y
>  CONFIG_USB=y
>  CONFIG_USB_EHCI_HCD=y
>  CONFIG_USB_GADGET=y
> +CONFIG_USB_ETHER=y
>  CONFIG_CI_UDC=y
>  CONFIG_OF_LIBFDT=y
> diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
> index 261ed12..18c0fa8 100644
> --- a/drivers/usb/gadget/Kconfig
> +++ b/drivers/usb/gadget/Kconfig
> @@ -36,6 +36,23 @@ menuconfig USB_GADGET
>  
>  if USB_GADGET
>  
> +config USB_ETHER
> +	bool "Ethernet Gadget"
> +	help
> +	  Enable Ethernet Gadget
> +
> +config USB_ETHER_RNDIS
> +	bool "RNDIS support"
> +	select USB_ETHER
> +	help
> +	  Microsoft Windows XP bundles the "Remote NDIS" (RNDIS) protocol,
> +	  and Microsoft provides redistributable binary RNDIS drivers for
> +	  older versions of Windows.
> +
> +	  If you say "y" here, the Ethernet gadget driver will try to provide
> +	  a second device configuration, supporting RNDIS to talk to such
> +	  Microsoft USB hosts.
> +
>  config USB_GADGET_ATMEL_USBA
>  	bool "Atmel USBA"
>  	select USB_GADGET_DUALSPEED
> diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
> index c7329cc..b614df4 100644
> --- a/include/configs/am335x_evm.h
> +++ b/include/configs/am335x_evm.h
> @@ -275,7 +275,6 @@
>  #endif
>  
>  #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/am3517_evm.h b/include/configs/am3517_evm.h
> index 26036c4..d84a80a 100644
> --- a/include/configs/am3517_evm.h
> +++ b/include/configs/am3517_evm.h
> @@ -81,7 +81,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 17b3a15..c89e3a9 100644
> --- a/include/configs/baltos.h
> +++ b/include/configs/baltos.h
> @@ -288,7 +288,6 @@
>  #define CONFIG_AM335X_USB1_MODE MUSB_OTG
>  
>  #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/cl-som-am57x.h b/include/configs/cl-som-am57x.h
> index c1cf413..8a25376 100644
> --- a/include/configs/cl-som-am57x.h
> +++ b/include/configs/cl-som-am57x.h
> @@ -91,7 +91,6 @@
>  /* USB Networking options */
>  #define CONFIG_USB_HOST_ETHER
>  #define CONFIG_USB_ETHER_SMSC95XX
> -#define CONFIG_USB_ETHER_RNDIS
>  #define CONFIG_USB_ETHER_ASIX
>  #define CONFIG_USB_ETHER_MCS7830
>  
> diff --git a/include/configs/cm_t54.h b/include/configs/cm_t54.h
> index 69706d2..7921b5d 100644
> --- a/include/configs/cm_t54.h
> +++ b/include/configs/cm_t54.h
> @@ -74,7 +74,6 @@
>  /* USB Networking options */
>  #define CONFIG_USB_HOST_ETHER
>  #define CONFIG_USB_ETHER_SMSC95XX
> -#define CONFIG_USB_ETHER_RNDIS
>  #define CONFIG_USB_ETHER_ASIX
>  #define CONFIG_USB_ETHER_MCS7830
>  
> diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
> index ff2b9c6..d46c3e6 100644
> --- a/include/configs/gw_ventana.h
> +++ b/include/configs/gw_ventana.h
> @@ -155,7 +155,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
>  #define CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP
> diff --git a/include/configs/h2200.h b/include/configs/h2200.h
> index fea4044..2f66ef4 100644
> --- a/include/configs/h2200.h
> +++ b/include/configs/h2200.h
> @@ -133,7 +133,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 2744efb..e03e3c6 100644
> --- a/include/configs/ma5d4evk.h
> +++ b/include/configs/ma5d4evk.h
> @@ -99,7 +99,6 @@
>  #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS	3
>  
>  /* 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 a1a0cda..674e998 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 2bba741..d347335 100644
> --- a/include/configs/novena.h
> +++ b/include/configs/novena.h
> @@ -138,7 +138,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 4422d5e..1a76dfc 100644
> --- a/include/configs/omap3_beagle.h
> +++ b/include/configs/omap3_beagle.h
> @@ -46,8 +46,6 @@
>  #define CONFIG_USB_MUSB_OMAP2PLUS
>  #define CONFIG_USB_MUSB_PIO_ONLY
>  #define CONFIG_TWL4030_USB		1
> -#define CONFIG_USB_ETHER
> -#define CONFIG_USB_ETHER_RNDIS
>  #define CONFIG_USB_FUNCTION_FASTBOOT
>  #define CONFIG_CMD_FASTBOOT
>  #define CONFIG_ANDROID_BOOT_IMAGE
> diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
> index 6e8afbf..79700a8 100644
> --- a/include/configs/omap3_logic.h
> +++ b/include/configs/omap3_logic.h
> @@ -63,8 +63,6 @@
>  /* USB */
>  #define CONFIG_USB_MUSB_OMAP2PLUS
>  #define CONFIG_USB_MUSB_PIO_ONLY
> -#define CONFIG_USB_ETHER
> -#define CONFIG_USB_ETHER_RNDIS
>  #define CONFIG_USB_FUNCTION_FASTBOOT
>  #define CONFIG_CMD_FASTBOOT
>  #define CONFIG_ANDROID_BOOT_IMAGE
> diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h
> index ce80e7e..245256b 100644
> --- a/include/configs/pcm051.h
> +++ b/include/configs/pcm051.h
> @@ -136,7 +136,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 b25be97..ebde19f 100644
> --- a/include/configs/sama5d2_ptc.h
> +++ b/include/configs/sama5d2_ptc.h
> @@ -73,7 +73,6 @@
>  #define CONFIG_USB_GADGET
>  #define CONFIG_USB_GADGET_DUALSPEED
>  #define CONFIG_USB_GADGET_ATMEL_USBA
> -#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 e55addb..a3b619f 100644
> --- a/include/configs/sansa_fuze_plus.h
> +++ b/include/configs/sansa_fuze_plus.h
> @@ -40,7 +40,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 22f070d..3aac86b 100644
> --- a/include/configs/siemens-am33x-common.h
> +++ b/include/configs/siemens-am33x-common.h
> @@ -188,7 +188,6 @@
>  #define CONFIG_AM335X_USB1_MODE MUSB_HOST
>  
>  #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/tao3530.h b/include/configs/tao3530.h
> index 38f5bd0..dc0ae5f 100644
> --- a/include/configs/tao3530.h
> +++ b/include/configs/tao3530.h
> @@ -232,9 +232,6 @@
>  #define CONFIG_USB_HOST_ETHER
>  #define CONFIG_USB_ETHER_SMSC95XX
>  
> -#define CONFIG_USB_ETHER
> -#define CONFIG_USB_ETHER_RNDIS
> -
>  /* 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 dc35b28..51db320 100644
> --- a/include/configs/vinco.h
> +++ b/include/configs/vinco.h
> @@ -70,7 +70,6 @@
>  #endif
>  
>  /* USB device */
> -#define CONFIG_USB_ETHER
>  #define CONFIG_USB_ETH_RNDIS
>  #define CONFIG_USBNET_MANUFACTURER      "L+G VInCo"
>  
> @@ -83,7 +82,6 @@
>  
>  #define CONFIG_USB_HOST_ETHER
>  #define CONFIG_USB_ETHER_SMSC95XX
> -#define CONFIG_USB_ETHER_RNDIS
>  
>  #ifdef CONFIG_SYS_USE_SERIALFLASH
>  /* bootstrap + u-boot + env + linux in serial flash */
> diff --git a/include/configs/warp7.h b/include/configs/warp7.h
> index 75ae8a3..4279855 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_HOST_ADDR		"de:ad:be:af:00:00"
> diff --git a/include/configs/xfi3.h b/include/configs/xfi3.h
> index bd829a9..ce7b9a5 100644
> --- a/include/configs/xfi3.h
> +++ b/include/configs/xfi3.h
> @@ -40,7 +40,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 93f0bf4..5971aeb 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -5120,12 +5120,10 @@ CONFIG_USB_EHCI_TEGRA
>  CONFIG_USB_EHCI_TXFIFO_THRESH
>  CONFIG_USB_EHCI_VCT
>  CONFIG_USB_EHCI_VF
> -CONFIG_USB_ETHER
>  CONFIG_USB_ETHER_ASIX
>  CONFIG_USB_ETHER_ASIX88179
>  CONFIG_USB_ETHER_DM9601
>  CONFIG_USB_ETHER_MCS7830
> -CONFIG_USB_ETHER_RNDIS
>  CONFIG_USB_ETHER_RTL8152
>  CONFIG_USB_ETHER_SMSC95XX
>  CONFIG_USB_ETHER_xxx
> -- 
> 2.7.4
>

-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com


More information about the U-Boot mailing list