usb: Move DWC3 and some gadget options to Kconfig

PATCH Superseded Semen Protsenko 3 participants 12 messages Apr 11, 2016 – Apr 13, 2016

Subsystems (9)

USB Arm Samsung Exynos Tegra architecture support Arm/Zynq architecture +5 more subsystems

lore

Share & tools

lore

Semen Protsenko

author

2016-04-11 15:27 UTC #0 lore raw

v3 cover usb: Move DWC3 and some gadget options to Kconfig

Hi All,

This patch series move next options to Kconfigs/defconfigs:
- CONFIG_USB_DWC3*
- CONFIG_USB_GADGET_VBUS_DRAW
- CONFIG_USB_GADGET_DUALSPEED
- CONFIG_USB_GADGET_DOWNLOAD
- CONFIG_G_DNL_*

All defconfig files were post-processed via "make savedefconfig" rule to keep correct order of options in defconfigs.

The whole series was tested using buildman tool (for all arm boards).

Semen Protsenko

author

2016-04-11 15:27 UTC #1 lore raw

PATCH v3 1/7 usb: gadget: Move CONFIG_USB_GADGET_VBUS_DRAW to Kconfig

From: Sam Protsenko <[email protected]>

The description was borrowed from kernel. Definitions were added to defconfig files in a way that "make savedefconfig" generates exactly the same file as used defconfig.

Boards using 0 mA as CONFIG_USB_GADGET_VBUS_DRAW value were moved to use 2 mA (as minimal allowed by Kconfig).

Signed-off-by Sam Protsenko <[email protected]>

---
Changes for v2:
- set minimal required value of VBUS_DRAW as 2 mA (as it's done in kernel)

 drivers/usb/gadget/Kconfig                | 21 +++++++++++++++++++++
 include/configs/am335x_evm.h              |  1 -
 include/configs/am43xx_evm.h              |  5 ++++-
 include/configs/baltos.h                  |  1 -
 include/configs/bav335x.h                 |  1 -
 include/configs/bcm28155_ap.h             |  1 -
 include/configs/cgtqmx6eval.h             |  1 -
 include/configs/colibri_vf.h              |  1 -
 include/configs/corvus.h                  |  1 -
 include/configs/dra7xx_evm.h              |  1 -
 include/configs/exynos4-common.h          |  1 -
 include/configs/gw_ventana.h              |  1 -
 include/configs/kc1.h                     |  1 -
 include/configs/mx6sabre_common.h         |  1 -
 include/configs/mx7dsabresd.h             |  1 -
 include/configs/nitrogen6x.h              |  1 -
 include/configs/odroid_xu3.h              |  1 -
 include/configs/omap3_beagle.h            |  1 -
 include/configs/omap3_logic.h             |  1 -
 include/configs/omap5_uevm.h              |  1 -
 include/configs/pengwyn.h                 |  1 -
 include/configs/s5p_goni.h                |  1 -
 include/configs/siemens-am33x-common.h    |  1 -
 include/configs/smartweb.h                |  1 -
 include/configs/sniper.h                  |  1 -
 include/configs/socfpga_common.h          |  1 -
 include/configs/sunxi-common.h            |  1 -
 include/configs/taurus.h                  |  1 -
 include/configs/tbs2910.h                 |  1 -
 include/configs/tegra-common-usb-gadget.h |  1 -
 include/configs/warp.h                    |  1 -
 include/configs/xilinx_zynqmp.h           |  1 -
 include/configs/zynq-common.h             |  1 -
 33 files changed, 25 insertions(+), 32 deletions(-)

drivers/usb/gadget/Kconfig +21 -0

index f4698f4..cfd8ce8 100644
@@ -33,3 +33,24 @@ menuconfig USB_GADGET
 	   a USB peripheral device.  Configure one hardware driver for your
 	   peripheral/device side bus controller, and a "gadget driver" for
 	   your peripheral protocol.
+
+if USB_GADGET
+
+config USB_GADGET_VBUS_DRAW
+	int "Maximum VBUS Power usage (2-500 mA)"
+	range 2 500
+	default 2
+	help
+	   Some devices need to draw power from USB when they are
+	   configured, perhaps to operate circuitry or to recharge
+	   batteries.  This is in addition to any local power supply,
+	   such as an AC adapter or batteries.
+
+	   Enter the maximum power your device draws through USB, in
+	   milliAmperes.  The permitted range of values is 2 - 500 mA;
+	   0 mA would be legal, but can make some hosts misbehave.
+
+	   This value will be used except for system-specific gadget
+	   drivers that have more specific information.
+
+endif # USB_GADGET

include/configs/am335x_evm.h +0 -1

index 29b693a..8d68d60 100644
@@ -290,7 +290,6 @@
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 #define CONFIG_USB_GADGET_DOWNLOAD
 #define CONFIG_USB_GADGET_DUALSPEED
-#define CONFIG_USB_GADGET_VBUS_DRAW	2
 #define CONFIG_USB_MUSB_HOST
 #define CONFIG_AM335X_USB0
 #define CONFIG_AM335X_USB0_MODE	MUSB_PERIPHERAL

include/configs/am43xx_evm.h +4 -1

index fd3f6a7..0dd9c7a7 100644
@@ -122,6 +122,10 @@
 #endif
 
 /* USB GADGET */
+#if defined(CONFIG_SPL_BUILD) && !defined(CONFIG_SPL_USBETH_SUPPORT)
+#undef CONFIG_USB_GADGET_VBUS_DRAW
+#endif
+
 #if !defined(CONFIG_SPL_BUILD) || \
 	(defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT))
 #define CONFIG_USB_DWC3_PHY_OMAP

@@ -130,7 +134,6 @@
 #define CONFIG_USB_DWC3_GADGET
 
 #define CONFIG_USB_GADGET_DOWNLOAD
-#define CONFIG_USB_GADGET_VBUS_DRAW 2
 #define CONFIG_G_DNL_MANUFACTURER "Texas Instruments"
 #define CONFIG_G_DNL_VENDOR_NUM 0x0403
 #define CONFIG_G_DNL_PRODUCT_NUM 0xBD00

include/configs/baltos.h +0 -1

index bfe3fa3..529cf1c 100644
@@ -276,7 +276,6 @@
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 #define CONFIG_USBDOWNLOAD_GADGET
 #define CONFIG_USB_GADGET_DUALSPEED
-#define CONFIG_USB_GADGET_VBUS_DRAW	2
 #define CONFIG_USB_MUSB_HOST
 #define CONFIG_AM335X_USB0
 #define CONFIG_AM335X_USB0_MODE	MUSB_HOST

include/configs/bav335x.h +0 -1

index 6c860a6..82bf92a 100644
@@ -441,7 +441,6 @@ DEFAULT_LINUX_BOOT_ENV \
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 #define CONFIG_USB_GADGET_DOWNLOAD
 #define CONFIG_USB_GADGET_DUALSPEED
-#define CONFIG_USB_GADGET_VBUS_DRAW	2
 #define CONFIG_USB_MUSB_HOST
 #define CONFIG_AM335X_USB0
 #define CONFIG_AM335X_USB0_MODE	MUSB_PERIPHERAL

include/configs/bcm28155_ap.h +0 -1

index cf25bde..387895b 100644
@@ -139,7 +139,6 @@
 #define CONFIG_FASTBOOT_BUF_SIZE	(CONFIG_SYS_SDRAM_SIZE - SZ_1M)
 #define CONFIG_FASTBOOT_BUF_ADDR	CONFIG_SYS_SDRAM_BASE
 #define CONFIG_USB_GADGET_DUALSPEED
-#define CONFIG_USB_GADGET_VBUS_DRAW	0
 #define CONFIG_USB_GADGET_DWC2_OTG
 #define CONFIG_USB_GADGET_BCM_UDC_OTG_PHY
 #define CONFIG_USB_GADGET_DOWNLOAD

include/configs/cgtqmx6eval.h +0 -1

index 63e3b94..3f3b69d 100644
@@ -93,7 +93,6 @@
 #define CONFIG_CMD_USB_MASS_STORAGE
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
 #define CONFIG_USB_GADGET_DOWNLOAD
-#define CONFIG_USB_GADGET_VBUS_DRAW	2
 
 #define CONFIG_G_DNL_VENDOR_NUM		0x0525
 #define CONFIG_G_DNL_PRODUCT_NUM	0xa4a5

include/configs/colibri_vf.h +0 -1

index 7f57a54..63dbe12 100644
@@ -235,7 +235,6 @@
 /* USB Client Support */
 #define CONFIG_CI_UDC
 #define CONFIG_USB_GADGET_DUALSPEED
-#define CONFIG_USB_GADGET_VBUS_DRAW      2
 #define CONFIG_TRDX_VID                  0x1B67
 #define CONFIG_TRDX_PID_COLIBRI_VF50     0x0016
 #define CONFIG_TRDX_PID_COLIBRI_VF61     0x0017

include/configs/corvus.h +0 -1

index fcf2bd6..b8c441e 100644
@@ -125,7 +125,6 @@
 #define CONFIG_USB_FUNCTION_DFU
 #define CONFIG_DFU_NAND
 #define CONFIG_USB_GADGET_DOWNLOAD
-#define CONFIG_USB_GADGET_VBUS_DRAW	2
 #define CONFIG_SYS_DFU_DATA_BUF_SIZE	(SZ_1M)
 #define DFU_MANIFEST_POLL_TIMEOUT	25000

include/configs/dra7xx_evm.h +0 -1

index 7734e8d..e9facae 100644
@@ -233,7 +233,6 @@
 #define CONFIG_USB_DWC3_GADGET
 
 #define CONFIG_USB_GADGET_DOWNLOAD
-#define CONFIG_USB_GADGET_VBUS_DRAW 2
 #define CONFIG_G_DNL_MANUFACTURER "Texas Instruments"
 #define CONFIG_G_DNL_VENDOR_NUM 0x0451
 #define CONFIG_G_DNL_PRODUCT_NUM 0xd022

include/configs/exynos4-common.h +0 -1

index 008d24c..c8e5397 100644
@@ -53,7 +53,6 @@
 #define CONFIG_USB_GADGET_DWC2_OTG
 #define CONFIG_USB_GADGET_DWC2_OTG_PHY
 #define CONFIG_USB_GADGET_DUALSPEED
-#define CONFIG_USB_GADGET_VBUS_DRAW	2
 
 #define CONFIG_CMD_USB_MASS_STORAGE
 #define CONFIG_USB_FUNCTION_MASS_STORAGE

include/configs/gw_ventana.h +0 -1

index 793b3fb..62f3468 100644
@@ -196,7 +196,6 @@
 #define CONFIG_CMD_USB_MASS_STORAGE
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
 #define CONFIG_USB_GADGET_DOWNLOAD
-#define CONFIG_USB_GADGET_VBUS_DRAW    2
 
 /* Netchip IDs */
 #define CONFIG_G_DNL_VENDOR_NUM 0x0525

include/configs/kc1.h +0 -1

index ee7d9ce..d8aa182 100644
@@ -185,7 +185,6 @@
 #define CONFIG_USB_MUSB_OMAP2PLUS
 
 #define CONFIG_USB_GADGET_DUALSPEED
-#define CONFIG_USB_GADGET_VBUS_DRAW	0
 
 /*
  * Download

include/configs/mx6sabre_common.h +0 -1

index ceea74e..299f11b 100644
@@ -241,7 +241,6 @@
 #define CONFIG_CMD_USB_MASS_STORAGE
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
 #define CONFIG_USB_GADGET_DOWNLOAD
-#define CONFIG_USB_GADGET_VBUS_DRAW	2
 
 #define CONFIG_G_DNL_VENDOR_NUM		0x0525
 #define CONFIG_G_DNL_PRODUCT_NUM	0xa4a5

include/configs/mx7dsabresd.h +0 -1

index 5d897c2..506ac32 100644
@@ -256,7 +256,6 @@
 #define CONFIG_CMD_USB_MASS_STORAGE
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
 #define CONFIG_USB_GADGET_DOWNLOAD
-#define CONFIG_USB_GADGET_VBUS_DRAW	2
 
 #define CONFIG_G_DNL_VENDOR_NUM		0x0525
 #define CONFIG_G_DNL_PRODUCT_NUM	0xa4a5

include/configs/nitrogen6x.h +0 -1

index 3604e44..a50829e 100644
@@ -333,7 +333,6 @@
 #define CONFIG_CMD_USB_MASS_STORAGE
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
 #define CONFIG_USB_GADGET_DOWNLOAD
-#define CONFIG_USB_GADGET_VBUS_DRAW	2
 
 /* Netchip IDs */
 #define CONFIG_G_DNL_VENDOR_NUM 0x0525

include/configs/odroid_xu3.h +0 -1

index 01d08dc..e4986b0 100644
@@ -54,7 +54,6 @@
 
 /* USB gadget */
 #define CONFIG_USB_GADGET_DUALSPEED
-#define CONFIG_USB_GADGET_VBUS_DRAW	2
 
 /* Downloader */
 #define CONFIG_G_DNL_VENDOR_NUM		0x04E8

include/configs/omap3_beagle.h +0 -1

index 2112d9f..17d8a86 100644
@@ -66,7 +66,6 @@
 #define CONFIG_TWL4030_USB		1
 #define CONFIG_USB_ETHER
 #define CONFIG_USB_ETHER_RNDIS
-#define CONFIG_USB_GADGET_VBUS_DRAW	0
 #define CONFIG_USB_GADGET_DOWNLOAD
 #define CONFIG_G_DNL_VENDOR_NUM		0x0451
 #define CONFIG_G_DNL_PRODUCT_NUM	0xd022

include/configs/omap3_logic.h +0 -1

index 304e1ce..7e802e9 100644
@@ -85,7 +85,6 @@
 #define CONFIG_USB_GADGET_DUALSPEED
 #define CONFIG_USB_ETHER
 #define CONFIG_USB_ETHER_RNDIS
-#define CONFIG_USB_GADGET_VBUS_DRAW	0
 #define CONFIG_USB_GADGET_DOWNLOAD
 #define CONFIG_G_DNL_VENDOR_NUM		0x0451
 #define CONFIG_G_DNL_PRODUCT_NUM	0xd022

include/configs/omap5_uevm.h +0 -1

index a5cfa0c..09beb74 100644
@@ -106,7 +106,6 @@
 #define CONFIG_USB_DWC3_GADGET
 
 #define CONFIG_USB_GADGET_DOWNLOAD
-#define CONFIG_USB_GADGET_VBUS_DRAW 2
 #define CONFIG_G_DNL_MANUFACTURER "Texas Instruments"
 #define CONFIG_G_DNL_VENDOR_NUM 0x0403
 #define CONFIG_G_DNL_PRODUCT_NUM 0xBD00

include/configs/pengwyn.h +0 -1

index 1a670cb..ec3fcba 100644
@@ -200,7 +200,6 @@
 #define CONFIG_USB_MUSB_PIO_ONLY
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 #define CONFIG_USB_GADGET_DUALSPEED
-#define CONFIG_USB_GADGET_VBUS_DRAW	2
 #define CONFIG_USB_MUSB_HOST
 #define CONFIG_AM335X_USB0
 #define CONFIG_AM335X_USB0_MODE	MUSB_PERIPHERAL

include/configs/s5p_goni.h +0 -1

index 07a5134..919c60e 100644
@@ -273,7 +273,6 @@
 #define CONFIG_USB_GADGET_DWC2_OTG
 #define CONFIG_USB_GADGET_DWC2_OTG_PHY
 #define CONFIG_USB_GADGET_DUALSPEED
-#define CONFIG_USB_GADGET_VBUS_DRAW 2
 #define CONFIG_CMD_USB_MASS_STORAGE
 #define CONFIG_USB_FUNCTION_MASS_STORAGE

include/configs/siemens-am33x-common.h +0 -1

index df2a514..df4e734 100644
@@ -225,7 +225,6 @@
 #define CONFIG_USB_MUSB_PIO_ONLY
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 #undef CONFIG_USB_GADGET_DUALSPEED
-#define CONFIG_USB_GADGET_VBUS_DRAW	2
 #define CONFIG_USB_MUSB_HOST
 
 #define CONFIG_AM335X_USB0

include/configs/smartweb.h +0 -1

index db820ba..0586aec 100644
@@ -176,7 +176,6 @@
 #define CONFIG_USB_FUNCTION_DFU
 #define CONFIG_DFU_NAND
 #define CONFIG_USB_GADGET_DOWNLOAD
-#define CONFIG_USB_GADGET_VBUS_DRAW	2
 #define CONFIG_SYS_DFU_DATA_BUF_SIZE	SZ_1M
 #define DFU_MANIFEST_POLL_TIMEOUT	25000

include/configs/sniper.h +0 -1

index 18a379d..12090a3 100644
@@ -202,7 +202,6 @@
 #define CONFIG_TWL4030_USB
 
 #define CONFIG_USB_GADGET_DUALSPEED
-#define CONFIG_USB_GADGET_VBUS_DRAW	0
 
 /*
  * Download

include/configs/socfpga_common.h +0 -1

index 3e50892..bdb06e7 100644
@@ -252,7 +252,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
 #if defined(CONFIG_CMD_DFU) || defined(CONFIG_CMD_USB_MASS_STORAGE)
 #define CONFIG_USB_GADGET_DWC2_OTG
 #define CONFIG_USB_GADGET_DUALSPEED
-#define CONFIG_USB_GADGET_VBUS_DRAW	2
 
 /* USB Composite download gadget - g_dnl */
 #define CONFIG_USB_GADGET_DOWNLOAD

include/configs/sunxi-common.h +0 -1

index 8f11eb9..b5d05cd 100644
@@ -343,7 +343,6 @@ extern int soft_i2c_gpio_scl;
 
 #ifdef CONFIG_USB_MUSB_GADGET
 #define CONFIG_USB_GADGET_DUALSPEED
-#define CONFIG_USB_GADGET_VBUS_DRAW	0
 
 #define CONFIG_USB_GADGET_DOWNLOAD
 #define CONFIG_USB_FUNCTION_DFU

include/configs/taurus.h +0 -1

index 5b190f6..0b04b3a 100644
@@ -140,7 +140,6 @@
 #define CONFIG_USB_FUNCTION_DFU
 #define CONFIG_DFU_NAND
 #define CONFIG_USB_GADGET_DOWNLOAD
-#define CONFIG_USB_GADGET_VBUS_DRAW	2
 #define CONFIG_SYS_DFU_DATA_BUF_SIZE	(SZ_1M)
 #define DFU_MANIFEST_POLL_TIMEOUT	25000

include/configs/tbs2910.h +0 -1

index 1b5046a..715994c 100644
@@ -132,7 +132,6 @@
 #define CONFIG_USBD_HS
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
 #define CONFIG_USB_GADGET_DUALSPEED
-#define CONFIG_USB_GADGET_VBUS_DRAW	0
 #define CONFIG_USB_GADGET_DOWNLOAD
 #define CONFIG_G_DNL_VENDOR_NUM		0x0525
 #define CONFIG_G_DNL_PRODUCT_NUM	0xa4a5

include/configs/tegra-common-usb-gadget.h +0 -1

index c3a0151..ec034a1 100644
@@ -10,7 +10,6 @@
 
 #ifndef CONFIG_SPL_BUILD
 /* USB gadget mode support*/
-#define CONFIG_USB_GADGET_VBUS_DRAW    2
 #define CONFIG_CI_UDC
 #define CONFIG_CI_UDC_HAS_HOSTPC
 #define CONFIG_USB_GADGET_DUALSPEED

include/configs/warp.h +0 -1

index cb93629..80c4e38 100644
@@ -81,7 +81,6 @@
 #define CONFIG_CMD_USB_MASS_STORAGE
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
 #define CONFIG_USB_GADGET_DOWNLOAD
-#define CONFIG_USB_GADGET_VBUS_DRAW	2
 
 #define CONFIG_G_DNL_VENDOR_NUM		0x0525
 #define CONFIG_G_DNL_PRODUCT_NUM	0xa4a5

include/configs/xilinx_zynqmp.h +0 -1

index 8cea610..3a96483 100644
@@ -130,7 +130,6 @@
 
 #define CONFIG_USB_GADGET_DOWNLOAD
 #define CONFIG_USB_GADGET_DUALSPEED
-#define CONFIG_USB_GADGET_VBUS_DRAW	2
 #define CONFIG_USBDOWNLOAD_GADGET
 #define CONFIG_SYS_DFU_DATA_BUF_SIZE	0x1800000
 #define DFU_DEFAULT_POLL_TIMEOUT	300

include/configs/zynq-common.h +0 -1

index d8e3fa4..941372d 100644
@@ -107,7 +107,6 @@
 # define DFU_DEFAULT_POLL_TIMEOUT	300
 # define CONFIG_USB_FUNCTION_DFU
 # define CONFIG_DFU_RAM
-# define CONFIG_USB_GADGET_VBUS_DRAW	2
 # define CONFIG_G_DNL_VENDOR_NUM	0x03FD
 # define CONFIG_G_DNL_PRODUCT_NUM	0x0300
 # define CONFIG_G_DNL_MANUFACTURER	"Xilinx"

Signature · 1 line

2.8.0.rc3

Stephen Warren

2016-04-11 17:29 UTC #2 lore raw

PATCH v3 1/7 usb: gadget: Move CONFIG_USB_GADGET_VBUS_DRAW to Kconfig

Quoted 8 lines · Semen Protsenko

From: Sam Protsenko <[email protected]>
The description was borrowed from kernel. Definitions were added to defconfig files in a way that "make savedefconfig" generates exactly the same file as used defconfig.
Boards using 0 mA as CONFIG_USB_GADGET_VBUS_DRAW value were moved to use 2 mA (as minimal allowed by Kconfig).

The series (at least the Tegra parts),

Acked-by Stephen Warren <[email protected]>

Semen Protsenko

author

2016-04-11 15:27 UTC #3 lore raw

PATCH v3 2/7 usb: gadget: Move CONFIG_USB_GADGET_DUALSPEED to Kconfig

In reply to Semen Protsenko

From: Sam Protsenko <[email protected]>

Move CONFIG_USB_GADGET_DUALSPEED option to Kconfig and make all UDC controllers select USB_GADGET_DUALSPEED:
- add next options to Kconfig selecting USB_GADGET_DUALSPEED:
- USB_GADGET_ATMEL_USBA
- USB_GADGET_DWC2_OTG
- USB_DWC3
- CI_UDC
- make USB_MUSB_GADGET select USB_GADGET_DUALSPEED

While at it, make some related fixes:
- remove DUALSPEED from configs that don't enable gadget support:
- kwb.h
- tseries.h
- add missing USB_GADGET option to next configs:
- novena_defconfig
- pcm051_rev*_defconfig
- xfi3_defconfig

Signed-off-by Sam Protsenko <[email protected]>

---
Changes for v3:
- add all UDC controllers that can select DUALSPEED option (to prevent some platforms of being broken due to moving DUALSPEED option to Kconfig)

 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_gp_evm_defconfig              |  1 +
 configs/am437x_gp_evm_defconfig              |  1 +
 configs/am437x_sk_evm_defconfig              |  1 +
 configs/am43xx_evm_defconfig                 |  1 +
 configs/am43xx_evm_ethboot_defconfig         |  1 +
 configs/am43xx_evm_qspiboot_defconfig        |  1 +
 configs/am43xx_evm_usbhost_boot_defconfig    |  1 +
 configs/apalis_t30_defconfig                 |  1 +
 configs/bcm11130_defconfig                   |  1 +
 configs/bcm11130_nand_defconfig              |  1 +
 configs/bcm28155_ap_defconfig                |  1 +
 configs/bcm28155_w1d_defconfig               |  1 +
 configs/beaver_defconfig                     |  1 +
 configs/birdland_bav335a_defconfig           |  1 +
 configs/birdland_bav335b_defconfig           |  1 +
 configs/cgtqmx6eval_defconfig                |  1 +
 configs/colibri_t20_defconfig                |  5 +++--
 configs/colibri_t30_defconfig                |  1 +
 configs/colibri_vf_defconfig                 |  1 +
 configs/corvus_defconfig                     |  1 +
 configs/dalmore_defconfig                    |  1 +
 configs/dra72_evm_defconfig                  |  1 +
 configs/dra74_evm_defconfig                  |  1 +
 configs/dra7xx_evm_defconfig                 |  1 +
 configs/dra7xx_evm_qspiboot_defconfig        |  1 +
 configs/dra7xx_evm_uart3_defconfig           |  1 +
 configs/draco_defconfig                      |  1 +
 configs/e2220-1170_defconfig                 |  1 +
 configs/gwventana_defconfig                  |  1 +
 configs/jetson-tk1_defconfig                 |  1 +
 configs/ma5d4evk_defconfig                   |  1 +
 configs/mx6dlsabreauto_defconfig             |  1 +
 configs/mx6dlsabresd_defconfig               |  1 +
 configs/mx6qpsabreauto_defconfig             |  1 +
 configs/mx6qsabreauto_defconfig              |  1 +
 configs/mx6qsabrelite_defconfig              |  1 +
 configs/mx6qsabresd_defconfig                |  1 +
 configs/mx6sabresd_spl_defconfig             |  1 +
 configs/mx7dsabresd_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                     |  3 +++
 configs/nyan-big_defconfig                   |  1 +
 configs/odroid-xu3_defconfig                 |  1 +
 configs/odroid_defconfig                     |  1 +
 configs/omap3_beagle_defconfig               |  1 +
 configs/omap3_logic_defconfig                |  1 +
 configs/omap5_uevm_defconfig                 |  1 +
 configs/origen_defconfig                     |  1 +
 configs/p2371-0000_defconfig                 |  1 +
 configs/p2371-2180_defconfig                 |  1 +
 configs/p2571_defconfig                      |  1 +
 configs/pcm051_rev1_defconfig                |  3 +++
 configs/pcm051_rev3_defconfig                |  3 +++
 configs/pengwyn_defconfig                    |  1 +
 configs/pxm2_defconfig                       |  1 +
 configs/rastaban_defconfig                   |  1 +
 configs/rut_defconfig                        |  1 +
 configs/s5p_goni_defconfig                   |  1 +
 configs/s5pc210_universal_defconfig          |  1 +
 configs/sama5d2_xplained_mmc_defconfig       |  1 +
 configs/sama5d2_xplained_spiflash_defconfig  |  1 +
 configs/sama5d3xek_mmc_defconfig             |  1 +
 configs/sama5d3xek_nandflash_defconfig       |  1 +
 configs/sama5d3xek_spiflash_defconfig        |  1 +
 configs/sama5d4_xplained_mmc_defconfig       |  1 +
 configs/sama5d4_xplained_nandflash_defconfig |  1 +
 configs/sama5d4_xplained_spiflash_defconfig  |  1 +
 configs/sama5d4ek_mmc_defconfig              |  1 +
 configs/sama5d4ek_nandflash_defconfig        |  1 +
 configs/sama5d4ek_spiflash_defconfig         |  1 +
 configs/sansa_fuze_plus_defconfig            |  3 +++
 configs/socfpga_arria5_defconfig             |  1 +
 configs/socfpga_cyclone5_defconfig           |  1 +
 configs/socfpga_de0_nano_soc_defconfig       |  1 +
 configs/socfpga_mcvevk_defconfig             |  1 +
 configs/socfpga_sockit_defconfig             |  1 +
 configs/socfpga_socrates_defconfig           |  1 +
 configs/tbs2910_defconfig                    |  1 +
 configs/thuban_defconfig                     |  1 +
 configs/trats2_defconfig                     |  1 +
 configs/trats_defconfig                      |  1 +
 configs/venice2_defconfig                    |  1 +
 configs/vinco_defconfig                      |  1 +
 configs/warp_defconfig                       |  1 +
 configs/xfi3_defconfig                       |  3 +++
 configs/xilinx_zynqmp_ep_defconfig           |  1 +
 configs/zynq_picozed_defconfig               |  5 +++--
 configs/zynq_zc702_defconfig                 |  5 +++--
 configs/zynq_zc706_defconfig                 |  5 +++--
 configs/zynq_zed_defconfig                   |  5 +++--
 configs/zynq_zybo_defconfig                  |  5 +++--
 drivers/usb/Kconfig                          |  2 ++
 drivers/usb/dwc3/Kconfig                     |  7 +++++++
 drivers/usb/gadget/Kconfig                   | 27 +++++++++++++++++++++++++++
 drivers/usb/musb-new/Kconfig                 |  1 +
 include/configs/am335x_evm.h                 |  2 --
 include/configs/am3517_evm.h                 |  1 -
 include/configs/am43xx_evm.h                 |  5 +++--
 include/configs/baltos.h                     |  2 --
 include/configs/bav335x.h                    |  2 --
 include/configs/bcm28155_ap.h                |  2 --
 include/configs/cgtqmx6eval.h                |  2 --
 include/configs/colibri_vf.h                 |  2 --
 include/configs/corvus.h                     |  3 ---
 include/configs/dra7xx_evm.h                 |  2 --
 include/configs/exynos4-common.h             |  2 --
 include/configs/gw_ventana.h                 |  2 --
 include/configs/kc1.h                        |  2 --
 include/configs/kwb.h                        |  2 --
 include/configs/ma5d4evk.h                   |  2 --
 include/configs/mx6sabre_common.h            |  2 --
 include/configs/mx7dsabresd.h                |  2 --
 include/configs/nitrogen6x.h                 |  2 --
 include/configs/novena.h                     |  2 --
 include/configs/odroid_xu3.h                 |  4 ----
 include/configs/omap3_beagle.h               |  2 --
 include/configs/omap3_logic.h                |  2 --
 include/configs/omap5_uevm.h                 |  2 --
 include/configs/pcm051.h                     |  2 --
 include/configs/pengwyn.h                    |  2 --
 include/configs/s5p_goni.h                   |  2 --
 include/configs/s5pc210_universal.h          |  2 --
 include/configs/sama5d2_xplained.h           |  2 --
 include/configs/sama5d3xek.h                 |  2 --
 include/configs/sama5d4_xplained.h           |  2 --
 include/configs/sama5d4ek.h                  |  2 --
 include/configs/sansa_fuze_plus.h            |  3 ---
 include/configs/siemens-am33x-common.h       |  1 -
 include/configs/sniper.h                     |  2 --
 include/configs/socfpga_common.h             |  3 ---
 include/configs/sunxi-common.h               |  1 -
 include/configs/tbs2910.h                    |  2 --
 include/configs/tegra-common-usb-gadget.h    |  2 --
 include/configs/tseries.h                    |  2 --
 include/configs/vinco.h                      |  2 --
 include/configs/warp.h                       |  2 --
 include/configs/xfi3.h                       |  3 ---
 include/configs/xilinx_zynqmp.h              |  2 --
 include/configs/zynq-common.h                |  2 --
 152 files changed, 166 insertions(+), 103 deletions(-)
 create mode 100644 drivers/usb/dwc3/Kconfig

configs/am335x_baltos_defconfig +1 -0

index bda8727..3562e58 100644
@@ -13,5 +13,6 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
+CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_OF_LIBFDT=y

configs/am335x_boneblack_defconfig +1 -0

index 8b6fa20..46ac471 100644
@@ -18,5 +18,6 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
+CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_OF_LIBFDT=y

configs/am335x_boneblack_vboot_defconfig +1 -0

index 70fc5d7..8208b3c 100644
@@ -25,4 +25,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_TIMER=y
 CONFIG_OMAP_TIMER=y
 CONFIG_USB=y
+CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y

configs/am335x_evm_defconfig +1 -0

index 8eaa123..b59ff81 100644
@@ -17,5 +17,6 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
+CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_OF_LIBFDT=y

configs/am335x_evm_nor_defconfig +1 -0

index 85a0ba9..9458fd1 100644
@@ -13,5 +13,6 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
+CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_OF_LIBFDT=y

configs/am335x_evm_norboot_defconfig +1 -0

index f3a26c3..5a84150 100644
@@ -10,5 +10,6 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
+CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_OF_LIBFDT=y

configs/am335x_evm_spiboot_defconfig +1 -0

index 92eb46c..c9e0761 100644
@@ -13,5 +13,6 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
+CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_OF_LIBFDT=y

configs/am335x_evm_usbspl_defconfig +1 -0

index 453714b..e8b2b91 100644
@@ -13,5 +13,6 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
+CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_OF_LIBFDT=y

configs/am335x_gp_evm_defconfig +1 -0

index 0c7eda7..f888211 100644
@@ -19,5 +19,6 @@ CONFIG_SYS_NS16550=y
 CONFIG_TIMER=y
 CONFIG_OMAP_TIMER=y
 CONFIG_USB=y
+CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_RSA=y

configs/am437x_gp_evm_defconfig +1 -0

index 356f6fd..e628bd4 100644
@@ -21,4 +21,5 @@ CONFIG_TI_QSPI=y
 CONFIG_TIMER=y
 CONFIG_OMAP_TIMER=y
 CONFIG_USB=y
+CONFIG_USB_DWC3=y
 CONFIG_USB_GADGET=y

configs/am437x_sk_evm_defconfig +1 -0

index 2e2827f..d556a7f 100644
@@ -25,4 +25,5 @@ CONFIG_TI_QSPI=y
 CONFIG_TIMER=y
 CONFIG_OMAP_TIMER=y
 CONFIG_USB=y
+CONFIG_USB_DWC3=y
 CONFIG_USB_GADGET=y

configs/am43xx_evm_defconfig +1 -0

index cc83006..9b746bf 100644
@@ -12,5 +12,6 @@ CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SYS_NS16550=y
 CONFIG_TI_QSPI=y
 CONFIG_USB=y
+CONFIG_USB_DWC3=y
 CONFIG_USB_GADGET=y
 CONFIG_OF_LIBFDT=y

configs/am43xx_evm_ethboot_defconfig +1 -0

index a720c14..30a344c 100644
@@ -11,5 +11,6 @@ CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SYS_NS16550=y
 CONFIG_TI_QSPI=y
 CONFIG_USB=y
+CONFIG_USB_DWC3=y
 CONFIG_USB_GADGET=y
 CONFIG_OF_LIBFDT=y

configs/am43xx_evm_qspiboot_defconfig +1 -0

index 6db389b..75c75dc 100644
@@ -10,5 +10,6 @@ CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SYS_NS16550=y
 CONFIG_TI_QSPI=y
 CONFIG_USB=y
+CONFIG_USB_DWC3=y
 CONFIG_USB_GADGET=y
 CONFIG_OF_LIBFDT=y

configs/am43xx_evm_usbhost_boot_defconfig +1 -0

index cbaf5a5..9c2234f 100644
@@ -11,5 +11,6 @@ CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SYS_NS16550=y
 CONFIG_TI_QSPI=y
 CONFIG_USB=y
+CONFIG_USB_DWC3=y
 CONFIG_USB_GADGET=y
 CONFIG_OF_LIBFDT=y

configs/apalis_t30_defconfig +1 -0

index 152d06f..a8b4621 100644
@@ -18,4 +18,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_CI_UDC=y
 CONFIG_USE_PRIVATE_LIBGCC=y

configs/bcm11130_defconfig +1 -0

index 222c319..11d20c0 100644
@@ -10,3 +10,4 @@ CONFIG_CMD_GPIO=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DWC2_OTG=y

configs/bcm11130_nand_defconfig +1 -0

index 7e1e682..b7336b4 100644
@@ -10,3 +10,4 @@ CONFIG_CMD_GPIO=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DWC2_OTG=y

configs/bcm28155_ap_defconfig +1 -0

index ba57944..15d3b8f 100644
@@ -9,3 +9,4 @@ CONFIG_CMD_GPIO=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DWC2_OTG=y

configs/bcm28155_w1d_defconfig +1 -0

index 36849d5..d06130c 100644
@@ -10,3 +10,4 @@ CONFIG_CMD_GPIO=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DWC2_OTG=y

configs/beaver_defconfig +1 -0

index 9e01f31..1ab24bd 100644
@@ -22,4 +22,5 @@ CONFIG_TEGRA20_SLINK=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_CI_UDC=y
 CONFIG_USE_PRIVATE_LIBGCC=y

configs/birdland_bav335a_defconfig +1 -0

index 2a81ded..807c945 100644
@@ -12,5 +12,6 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
+CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_OF_LIBFDT=y

configs/birdland_bav335b_defconfig +1 -0

index d2b35cd..f923cfd 100644
@@ -12,5 +12,6 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
+CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_OF_LIBFDT=y

configs/cgtqmx6eval_defconfig +1 -0

index 20b1492..c734725 100644
@@ -10,4 +10,5 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_CI_UDC=y
 CONFIG_OF_LIBFDT=y

configs/colibri_t20_defconfig +3 -2

index 3813e96..6f93f1c 100644
@@ -18,9 +18,10 @@ CONFIG_PWM_TEGRA=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
+CONFIG_USB_ULPI_VIEWPORT=y
+CONFIG_USB_ULPI=y
 CONFIG_USB_GADGET=y
+CONFIG_CI_UDC=y
 CONFIG_DM_VIDEO=y
 CONFIG_VIDEO_TEGRA20=y
-CONFIG_USB_ULPI=y
-CONFIG_USB_ULPI_VIEWPORT=y
 CONFIG_USE_PRIVATE_LIBGCC=y

configs/colibri_t30_defconfig +1 -0

index 6fd877b..74f90db 100644
@@ -16,4 +16,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_CI_UDC=y
 CONFIG_USE_PRIVATE_LIBGCC=y

configs/colibri_vf_defconfig +1 -0

index 267a453..ccba59b 100644
@@ -19,3 +19,4 @@ CONFIG_FSL_LPUART=y
 CONFIG_FSL_DSPI=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_CI_UDC=y

configs/corvus_defconfig +1 -0

index 3a9e4d7..9f38c37 100644
@@ -12,4 +12,5 @@ CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_ATMEL_USBA=y
 CONFIG_OF_LIBFDT=y

configs/dalmore_defconfig +1 -0

index 5e696a1..5b54e75 100644
@@ -20,4 +20,5 @@ CONFIG_TEGRA114_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_CI_UDC=y
 CONFIG_USE_PRIVATE_LIBGCC=y

configs/dra72_evm_defconfig +1 -0

index da24992..47fb0d7 100644
@@ -24,4 +24,5 @@ CONFIG_TI_QSPI=y
 CONFIG_TIMER=y
 CONFIG_OMAP_TIMER=y
 CONFIG_USB=y
+CONFIG_USB_DWC3=y
 CONFIG_USB_GADGET=y

configs/dra74_evm_defconfig +1 -0

index 9039b15..a15b65b 100644
@@ -23,4 +23,5 @@ CONFIG_TI_QSPI=y
 CONFIG_TIMER=y
 CONFIG_OMAP_TIMER=y
 CONFIG_USB=y
+CONFIG_USB_DWC3=y
 CONFIG_USB_GADGET=y

configs/dra7xx_evm_defconfig +1 -0

index 9be4c2d..2d504a5 100644
@@ -14,5 +14,6 @@ CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_SYS_NS16550=y
 CONFIG_TI_QSPI=y
 CONFIG_USB=y
+CONFIG_USB_DWC3=y
 CONFIG_USB_GADGET=y
 CONFIG_OF_LIBFDT=y

configs/dra7xx_evm_qspiboot_defconfig +1 -0

index b77c7c3..6af9619 100644
@@ -14,5 +14,6 @@ CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_SYS_NS16550=y
 CONFIG_TI_QSPI=y
 CONFIG_USB=y
+CONFIG_USB_DWC3=y
 CONFIG_USB_GADGET=y
 CONFIG_OF_LIBFDT=y

configs/dra7xx_evm_uart3_defconfig +1 -0

index 1a1fb6d..80ae9dd 100644
@@ -15,5 +15,6 @@ CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_SYS_NS16550=y
 CONFIG_TI_QSPI=y
 CONFIG_USB=y
+CONFIG_USB_DWC3=y
 CONFIG_USB_GADGET=y
 CONFIG_OF_LIBFDT=y

configs/draco_defconfig +1 -0

index ec33985..be3ec0a 100644
@@ -13,5 +13,6 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
+CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_OF_LIBFDT=y

configs/e2220-1170_defconfig +1 -0

index 196950d..e0790ab 100644
@@ -18,3 +18,4 @@ CONFIG_TEGRA114_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_CI_UDC=y

configs/gwventana_defconfig +1 -0

index 788ba9d..5228c84 100644
@@ -18,4 +18,5 @@ CONFIG_NETDEVICES=y
 CONFIG_E1000=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_CI_UDC=y
 CONFIG_OF_LIBFDT=y

configs/jetson-tk1_defconfig +1 -0

index 5e87624..3078386 100644
@@ -22,4 +22,5 @@ CONFIG_TEGRA114_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_CI_UDC=y
 CONFIG_USE_PRIVATE_LIBGCC=y

configs/ma5d4evk_defconfig +1 -0

index 39ce550..1b2b722 100644
@@ -12,3 +12,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4"
 CONFIG_SPI_FLASH=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_ATMEL_USBA=y

configs/mx6dlsabreauto_defconfig +1 -0

index ba53017..27ace90 100644
@@ -9,4 +9,5 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_CI_UDC=y
 CONFIG_OF_LIBFDT=y

configs/mx6dlsabresd_defconfig +1 -0

index 7a67bf5..d085ef7 100644
@@ -9,4 +9,5 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_CI_UDC=y
 CONFIG_OF_LIBFDT=y

configs/mx6qpsabreauto_defconfig +1 -0

index c27aa38..4273a32 100644
@@ -7,4 +7,5 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_CI_UDC=y
 CONFIG_OF_LIBFDT=y

configs/mx6qsabreauto_defconfig +1 -0

index 7699cbb..60262cd 100644
@@ -9,4 +9,5 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_CI_UDC=y
 CONFIG_OF_LIBFDT=y

configs/mx6qsabrelite_defconfig +1 -0

index 324f46f..917362a 100644
@@ -11,4 +11,5 @@ CONFIG_SPI_FLASH_SST=y
 CONFIG_DM_THERMAL=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_CI_UDC=y
 CONFIG_OF_LIBFDT=y

configs/mx6qsabresd_defconfig +1 -0

index 6c9e27e..333eb67 100644
@@ -9,4 +9,5 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_CI_UDC=y
 CONFIG_OF_LIBFDT=y

configs/mx6sabresd_spl_defconfig +1 -0

index 131bd21..2e0363f 100644
@@ -10,4 +10,5 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_CI_UDC=y
 CONFIG_OF_LIBFDT=y

configs/mx7dsabresd_defconfig +1 -0

index 08d19f9..d0a6305 100644
@@ -14,4 +14,5 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_PING=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_CI_UDC=y
 CONFIG_OF_LIBFDT=y

configs/nitrogen6dl2g_defconfig +1 -0

index 54f11e9..7ba591a 100644
@@ -9,4 +9,5 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_CI_UDC=y
 CONFIG_OF_LIBFDT=y

configs/nitrogen6dl_defconfig +1 -0

index f2ea841..3b46fb6 100644
@@ -9,4 +9,5 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_CI_UDC=y
 CONFIG_OF_LIBFDT=y

configs/nitrogen6q2g_defconfig +1 -0

index cf654d7..6049891 100644
@@ -9,4 +9,5 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_CI_UDC=y
 CONFIG_OF_LIBFDT=y

configs/nitrogen6q_defconfig +1 -0

index de8bb22..ce5b61f 100644
@@ -9,4 +9,5 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_CI_UDC=y
 CONFIG_OF_LIBFDT=y

configs/nitrogen6s1g_defconfig +1 -0

index 6030afc..2e264f2 100644
@@ -9,4 +9,5 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_CI_UDC=y
 CONFIG_OF_LIBFDT=y

configs/nitrogen6s_defconfig +1 -0

index fef827e..39b381f 100644
@@ -9,4 +9,5 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_CI_UDC=y
 CONFIG_OF_LIBFDT=y

configs/novena_defconfig +3 -0

index 9217823..f28d884 100644
@@ -7,4 +7,7 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_GPIO=y
+CONFIG_USB=y
+CONFIG_USB_GADGET=y
+CONFIG_CI_UDC=y
 CONFIG_OF_LIBFDT=y

configs/nyan-big_defconfig +1 -0

index de7e9eb..dc965cc 100644
@@ -35,6 +35,7 @@ CONFIG_TPM_TIS_INFINEON=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_CI_UDC=y
 CONFIG_DM_VIDEO=y
 CONFIG_DISPLAY=y
 CONFIG_VIDEO_TEGRA124=y

configs/odroid-xu3_defconfig +1 -0

index a5f25cd..4548cf0 100644
@@ -19,6 +19,7 @@ CONFIG_PMIC_S2MPS11=y
 CONFIG_DM_REGULATOR=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
+CONFIG_USB_DWC3=y
 CONFIG_USB_GADGET=y
 CONFIG_VIDEO_BRIDGE=y
 CONFIG_ERRNO_STR=y

configs/odroid_defconfig +1 -0

index 1634ed6..dbdbf96 100644
@@ -24,4 +24,5 @@ CONFIG_DM_REGULATOR_MAX77686=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DWC2_OTG=y
 CONFIG_ERRNO_STR=y

configs/omap3_beagle_defconfig +1 -0

index 798a7e5..ab3cac4 100644
@@ -8,5 +8,6 @@ CONFIG_SYS_EXTRA_OPTIONS="NAND"
 CONFIG_CMD_GPIO=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
+CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_OF_LIBFDT=y

configs/omap3_logic_defconfig +1 -0

index 02202d5..fefe209 100644
@@ -12,5 +12,6 @@ CONFIG_SYS_PROMPT="OMAP Logic # "
 CONFIG_CMD_GPIO=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
+CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_OF_LIBFDT=y

configs/omap5_uevm_defconfig +1 -0

index 50d8372..3fc75df 100644
@@ -8,5 +8,6 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
+CONFIG_USB_DWC3=y
 CONFIG_USB_GADGET=y
 CONFIG_OF_LIBFDT=y

configs/origen_defconfig +1 -0

index eda2225..2ce71d4 100644
@@ -14,3 +14,4 @@ CONFIG_OF_CONTROL=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DWC2_OTG=y

configs/p2371-0000_defconfig +1 -0

index b6f2954..4cff742 100644
@@ -19,3 +19,4 @@ CONFIG_TEGRA114_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_CI_UDC=y

configs/p2371-2180_defconfig +1 -0

index f7cc8e0..cd0d325 100644
@@ -21,3 +21,4 @@ CONFIG_TEGRA114_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_CI_UDC=y

configs/p2571_defconfig +1 -0

index 4d0986f..65d788a 100644
@@ -19,3 +19,4 @@ CONFIG_TEGRA114_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_CI_UDC=y

configs/pcm051_rev1_defconfig +3 -0

index b74b372..b7c5466 100644
@@ -9,4 +9,7 @@ CONFIG_CMD_GPIO=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_SYS_NS16550=y
+CONFIG_USB=y
+CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_GADGET=y
 CONFIG_OF_LIBFDT=y

configs/pcm051_rev3_defconfig +3 -0

index 18be2a0..cb39392 100644
@@ -9,4 +9,7 @@ CONFIG_CMD_GPIO=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_SYS_NS16550=y
+CONFIG_USB=y
+CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_GADGET=y
 CONFIG_OF_LIBFDT=y

configs/pengwyn_defconfig +1 -0

index 237b4c7..90ca1d2 100644
@@ -7,5 +7,6 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
+CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_OF_LIBFDT=y

configs/pxm2_defconfig +1 -0

index 88d75b5..13e27b5 100644
@@ -14,5 +14,6 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
+CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_OF_LIBFDT=y

configs/rastaban_defconfig +1 -0

index 8c3c735..6f92d84 100644
@@ -13,5 +13,6 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
+CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_OF_LIBFDT=y

configs/rut_defconfig +1 -0

index 2fb5c4c..d9367b3 100644
@@ -14,5 +14,6 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
+CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_OF_LIBFDT=y

configs/s5p_goni_defconfig +1 -0

index eb0604e..89c1195 100644
@@ -13,3 +13,4 @@ CONFIG_SYS_PROMPT="Goni # "
 # CONFIG_CMD_MISC is not set
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DWC2_OTG=y

configs/s5pc210_universal_defconfig +1 -0

index 7f27b4c..dfcf4b7 100644
@@ -13,3 +13,4 @@ CONFIG_OF_CONTROL=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DWC2_OTG=y

configs/sama5d2_xplained_mmc_defconfig +1 -0

index 7f89698..b77c2b5 100644
@@ -12,4 +12,5 @@ CONFIG_CMD_SF=y
 CONFIG_SPI_FLASH=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_ATMEL_USBA=y
 CONFIG_OF_LIBFDT=y

configs/sama5d2_xplained_spiflash_defconfig +1 -0

index 28318fa..5b942b5 100644
@@ -12,4 +12,5 @@ CONFIG_CMD_SF=y
 CONFIG_SPI_FLASH=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_ATMEL_USBA=y
 CONFIG_OF_LIBFDT=y

configs/sama5d3xek_mmc_defconfig +1 -0

index f8cb309..969fb4b 100644
@@ -10,4 +10,5 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_ATMEL=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_ATMEL_USBA=y
 CONFIG_OF_LIBFDT=y

configs/sama5d3xek_nandflash_defconfig +1 -0

index 3a7cc7d..6e242e0 100644
@@ -10,4 +10,5 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_ATMEL=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_ATMEL_USBA=y
 CONFIG_OF_LIBFDT=y

configs/sama5d3xek_spiflash_defconfig +1 -0

index e562f5a..2cceb57 100644
@@ -10,4 +10,5 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_ATMEL=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_ATMEL_USBA=y
 CONFIG_OF_LIBFDT=y

configs/sama5d4_xplained_mmc_defconfig +1 -0

index c0c0416..e26bb59 100644
@@ -12,4 +12,5 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_ATMEL=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_ATMEL_USBA=y
 CONFIG_OF_LIBFDT=y

configs/sama5d4_xplained_nandflash_defconfig +1 -0

index 96aefc7..b2067b9 100644
@@ -12,4 +12,5 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_ATMEL=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_ATMEL_USBA=y
 CONFIG_OF_LIBFDT=y

configs/sama5d4_xplained_spiflash_defconfig +1 -0

index b9d1c3c..53ff55b 100644
@@ -12,4 +12,5 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_ATMEL=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_ATMEL_USBA=y
 CONFIG_OF_LIBFDT=y

configs/sama5d4ek_mmc_defconfig +1 -0

index 2a17e20..2b6f4ac 100644
@@ -12,4 +12,5 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_ATMEL=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_ATMEL_USBA=y
 CONFIG_OF_LIBFDT=y

configs/sama5d4ek_nandflash_defconfig +1 -0

index f92fe50..190a8e9 100644
@@ -12,4 +12,5 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_ATMEL=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_ATMEL_USBA=y
 CONFIG_OF_LIBFDT=y

configs/sama5d4ek_spiflash_defconfig +1 -0

index c5a3431..9b5faa0 100644
@@ -12,4 +12,5 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_ATMEL=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_ATMEL_USBA=y
 CONFIG_OF_LIBFDT=y

configs/sansa_fuze_plus_defconfig +3 -0

index b8949aa..78df0ac 100644
@@ -5,4 +5,7 @@ CONFIG_SPL=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_USB=y
+CONFIG_USB_GADGET=y
+CONFIG_CI_UDC=y
 CONFIG_OF_LIBFDT=y

configs/socfpga_arria5_defconfig +1 -0

index 087d6f1..372b312 100644
@@ -28,3 +28,4 @@ CONFIG_DESIGNWARE_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DWC2_OTG=y

configs/socfpga_cyclone5_defconfig +1 -0

index cef644e..b4de001 100644
@@ -28,3 +28,4 @@ CONFIG_DESIGNWARE_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DWC2_OTG=y

configs/socfpga_de0_nano_soc_defconfig +1 -0

index c0ffad2..a03d161 100644
@@ -23,3 +23,4 @@ CONFIG_SPI_FLASH_BAR=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DWC2_OTG=y

configs/socfpga_mcvevk_defconfig +1 -0

index e01282c..d5d5a5c 100644
@@ -23,3 +23,4 @@ CONFIG_SPI_FLASH_BAR=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DWC2_OTG=y

configs/socfpga_sockit_defconfig +1 -0

index 8feb5a3..52d1d18 100644
@@ -28,3 +28,4 @@ CONFIG_DESIGNWARE_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DWC2_OTG=y

configs/socfpga_socrates_defconfig +1 -0

index 1b3c3df..902b4d2 100644
@@ -27,3 +27,4 @@ CONFIG_SPI_FLASH_BAR=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DWC2_OTG=y

configs/tbs2910_defconfig +1 -0

index d0fda48..dc8be76 100644
@@ -10,4 +10,5 @@ CONFIG_DM=y
 CONFIG_DM_THERMAL=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_CI_UDC=y
 CONFIG_OF_LIBFDT=y

configs/thuban_defconfig +1 -0

index 39c8595..95d516f 100644
@@ -13,5 +13,6 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
+CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_OF_LIBFDT=y

configs/trats2_defconfig +1 -0

index 24656ef..60fbab9 100644
@@ -16,3 +16,4 @@ CONFIG_OF_CONTROL=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DWC2_OTG=y

configs/trats_defconfig +1 -0

index e48fae8..079233a 100644
@@ -15,3 +15,4 @@ CONFIG_OF_CONTROL=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DWC2_OTG=y

configs/venice2_defconfig +1 -0

index a7515ab..49ff533 100644
@@ -20,4 +20,5 @@ CONFIG_TEGRA114_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_CI_UDC=y
 CONFIG_USE_PRIVATE_LIBGCC=y

configs/vinco_defconfig +1 -0

index a16f376..565577d 100644
@@ -13,3 +13,4 @@ CONFIG_NETDEVICES=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_ATMEL_USBA=y

configs/warp_defconfig +1 -0

index e37158c..c7d185c 100644
@@ -10,4 +10,5 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_NFS is not set
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_CI_UDC=y
 CONFIG_OF_LIBFDT=y

configs/xfi3_defconfig +3 -0

index 437e018..652e443 100644
@@ -5,4 +5,7 @@ CONFIG_SPL=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_USB=y
+CONFIG_USB_GADGET=y
+CONFIG_CI_UDC=y
 CONFIG_OF_LIBFDT=y

configs/xilinx_zynqmp_ep_defconfig +1 -0

index 91ae10a..da7d259 100644
@@ -30,5 +30,6 @@ CONFIG_ZYNQ_SDHCI=y
 CONFIG_NAND_ARASAN=y
 CONFIG_ZYNQ_GEM=y
 CONFIG_USB=y
+CONFIG_USB_DWC3=y
 CONFIG_USB_GADGET=y
 # CONFIG_REGEX is not set

configs/zynq_picozed_defconfig +3 -2

index c730f3c..28fbd26 100644
@@ -13,6 +13,7 @@ CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_ZYNQ_SDHCI=y
 CONFIG_ZYNQ_GEM=y
 CONFIG_USB=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_ULPI=y
 CONFIG_USB_ULPI_VIEWPORT=y
+CONFIG_USB_ULPI=y
+CONFIG_USB_GADGET=y
+CONFIG_CI_UDC=y

configs/zynq_zc702_defconfig +3 -2

index e8d28e4..e561784 100644
@@ -25,6 +25,7 @@ CONFIG_DEBUG_UART_BASE=0xe0001000
 CONFIG_DEBUG_UART_CLOCK=50000000
 CONFIG_ZYNQ_QSPI=y
 CONFIG_USB=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_ULPI=y
 CONFIG_USB_ULPI_VIEWPORT=y
+CONFIG_USB_ULPI=y
+CONFIG_USB_GADGET=y
+CONFIG_CI_UDC=y

configs/zynq_zc706_defconfig +3 -2

index d19108f..d3a0f23 100644
@@ -22,6 +22,7 @@ CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_ZYNQ_GEM=y
 CONFIG_ZYNQ_QSPI=y
 CONFIG_USB=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_ULPI=y
 CONFIG_USB_ULPI_VIEWPORT=y
+CONFIG_USB_ULPI=y
+CONFIG_USB_GADGET=y
+CONFIG_CI_UDC=y

configs/zynq_zed_defconfig +3 -2

index b13de10..63512dd 100644
@@ -22,6 +22,7 @@ CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_ZYNQ_GEM=y
 CONFIG_ZYNQ_QSPI=y
 CONFIG_USB=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_ULPI=y
 CONFIG_USB_ULPI_VIEWPORT=y
+CONFIG_USB_ULPI=y
+CONFIG_USB_GADGET=y
+CONFIG_CI_UDC=y

configs/zynq_zybo_defconfig +3 -2

index d2f8110..e397acb 100644
@@ -24,6 +24,7 @@ CONFIG_DEBUG_UART_BASE=0xe0001000
 CONFIG_DEBUG_UART_CLOCK=50000000
 CONFIG_ZYNQ_QSPI=y
 CONFIG_USB=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_ULPI=y
 CONFIG_USB_ULPI_VIEWPORT=y
+CONFIG_USB_ULPI=y
+CONFIG_USB_GADGET=y
+CONFIG_CI_UDC=y

drivers/usb/Kconfig +2 -0

index bccf43e..da3ec2f 100644
@@ -49,6 +49,8 @@ config DM_USB
 
 source "drivers/usb/host/Kconfig"
 
+source "drivers/usb/dwc3/Kconfig"
+
 source "drivers/usb/musb-new/Kconfig"
 
 source "drivers/usb/emul/Kconfig"

drivers/usb/dwc3/Kconfig new file +7 -0

new file mode 100644
index 0000000..debc74b
@@ -0,0 +1,7 @@
+config USB_DWC3
+	bool "DesignWare USB3 DRD Core Support"
+	depends on (USB && USB_GADGET)
+	select USB_GADGET_DUALSPEED
+	help
+	  Say Y here if your system has a Dual Role SuperSpeed
+	  USB controller based on the DesignWare USB3 IP Core.

drivers/usb/gadget/Kconfig +27 -0

index cfd8ce8..5838d6e 100644
@@ -36,6 +36,29 @@ menuconfig USB_GADGET
 
 if USB_GADGET
 
+config USB_GADGET_ATMEL_USBA
+	bool "Atmel USBA"
+	select USB_GADGET_DUALSPEED
+	help
+	  USBA is the integrated high-speed USB Device controller on
+	  the AT32AP700x, some AT91SAM9 and AT91CAP9 processors from Atmel.
+
+config USB_GADGET_DWC2_OTG
+	bool "DesignWare USB2.0 HS OTG controller (gadget mode)"
+	select USB_GADGET_DUALSPEED
+	help
+	  The Designware USB2.0 high-speed gadget controller
+	  integrated into many SoCs. Select this option if you want the
+	  driver to operate in Peripheral mode. This option requires
+	  USB_GADGET to be enabled.
+
+config CI_UDC
+	bool "ChipIdea device controller"
+	select USB_GADGET_DUALSPEED
+	help
+	  Say Y here to enable device controller functionality of the
+	  ChipIdea driver.
+
 config USB_GADGET_VBUS_DRAW
 	int "Maximum VBUS Power usage (2-500 mA)"
 	range 2 500

@@ -53,4 +76,8 @@ config USB_GADGET_VBUS_DRAW
 	   This value will be used except for system-specific gadget
 	   drivers that have more specific information.
 
+# Selected by UDC drivers that support high-speed operation.
+config USB_GADGET_DUALSPEED
+	bool
+
 endif # USB_GADGET

drivers/usb/musb-new/Kconfig +1 -0

index 4e8a543..c264859 100644
@@ -10,6 +10,7 @@ config USB_MUSB_HOST
 
 config USB_MUSB_GADGET
 	bool "MUSB gadget mode support"
+	select USB_GADGET_DUALSPEED
 	help
 	  Enables the MUSB USB dual-role controller in gadget mode.

include/configs/am335x_evm.h +0 -2

index 8d68d60..f0e13b8 100644
@@ -285,11 +285,9 @@
  */
 #define CONFIG_USB_MUSB_DSPS
 #define CONFIG_ARCH_MISC_INIT
-#define CONFIG_USB_MUSB_GADGET
 #define CONFIG_USB_MUSB_PIO_ONLY
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 #define CONFIG_USB_GADGET_DOWNLOAD
-#define CONFIG_USB_GADGET_DUALSPEED
 #define CONFIG_USB_MUSB_HOST
 #define CONFIG_AM335X_USB0
 #define CONFIG_AM335X_USB0_MODE	MUSB_PERIPHERAL

include/configs/am3517_evm.h +0 -1

index fae8138..75fe558 100644
@@ -113,7 +113,6 @@
 #endif /* CONFIG_USB_MUSB_HOST */
 
 #ifdef CONFIG_USB_MUSB_GADGET
-#define CONFIG_USB_GADGET_DUALSPEED
 #define CONFIG_USB_ETHER
 #define CONFIG_USB_ETH_RNDIS
 #endif /* CONFIG_USB_MUSB_GADGET */

include/configs/am43xx_evm.h +3 -2

index 0dd9c7a7..8bea4c2 100644
@@ -123,21 +123,22 @@
 
 /* USB GADGET */
 #if defined(CONFIG_SPL_BUILD) && !defined(CONFIG_SPL_USBETH_SUPPORT)
+#undef CONFIG_USB_DWC3
+
 #undef CONFIG_USB_GADGET_VBUS_DRAW
+#undef CONFIG_USB_GADGET_DUALSPEED
 #endif
 
 #if !defined(CONFIG_SPL_BUILD) || \
 	(defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT))
 #define CONFIG_USB_DWC3_PHY_OMAP
 #define CONFIG_USB_DWC3_OMAP
-#define CONFIG_USB_DWC3
 #define CONFIG_USB_DWC3_GADGET
 
 #define CONFIG_USB_GADGET_DOWNLOAD
 #define CONFIG_G_DNL_MANUFACTURER "Texas Instruments"
 #define CONFIG_G_DNL_VENDOR_NUM 0x0403
 #define CONFIG_G_DNL_PRODUCT_NUM 0xBD00
-#define CONFIG_USB_GADGET_DUALSPEED
 #endif
 
 /*

include/configs/baltos.h +0 -2

index 529cf1c..8280e60 100644
@@ -271,11 +271,9 @@
  */
 #define CONFIG_USB_MUSB_DSPS
 #define CONFIG_ARCH_MISC_INIT
-#define CONFIG_USB_MUSB_GADGET
 #define CONFIG_USB_MUSB_PIO_ONLY
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 #define CONFIG_USBDOWNLOAD_GADGET
-#define CONFIG_USB_GADGET_DUALSPEED
 #define CONFIG_USB_MUSB_HOST
 #define CONFIG_AM335X_USB0
 #define CONFIG_AM335X_USB0_MODE	MUSB_HOST

include/configs/bav335x.h +0 -2

index 82bf92a..c223931 100644
@@ -436,11 +436,9 @@ DEFAULT_LINUX_BOOT_ENV \
  */
 #define CONFIG_USB_MUSB_DSPS
 #define CONFIG_ARCH_MISC_INIT
-#define CONFIG_USB_MUSB_GADGET
 #define CONFIG_USB_MUSB_PIO_ONLY
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 #define CONFIG_USB_GADGET_DOWNLOAD
-#define CONFIG_USB_GADGET_DUALSPEED
 #define CONFIG_USB_MUSB_HOST
 #define CONFIG_AM335X_USB0
 #define CONFIG_AM335X_USB0_MODE	MUSB_PERIPHERAL

include/configs/bcm28155_ap.h +0 -2

index 387895b..b431781 100644
@@ -138,8 +138,6 @@
 #define CONFIG_SYS_CACHELINE_SIZE	64
 #define CONFIG_FASTBOOT_BUF_SIZE	(CONFIG_SYS_SDRAM_SIZE - SZ_1M)
 #define CONFIG_FASTBOOT_BUF_ADDR	CONFIG_SYS_SDRAM_BASE
-#define CONFIG_USB_GADGET_DUALSPEED
-#define CONFIG_USB_GADGET_DWC2_OTG
 #define CONFIG_USB_GADGET_BCM_UDC_OTG_PHY
 #define CONFIG_USB_GADGET_DOWNLOAD
 #define CONFIG_USBID_ADDR		0x34052c46

include/configs/cgtqmx6eval.h +0 -2

index 3f3b69d..db207b9 100644
@@ -86,9 +86,7 @@
 #define CONFIG_USB_KEYBOARD
 #define CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP
 
-#define CONFIG_CI_UDC
 #define CONFIG_USBD_HS
-#define CONFIG_USB_GADGET_DUALSPEED
 
 #define CONFIG_CMD_USB_MASS_STORAGE
 #define CONFIG_USB_FUNCTION_MASS_STORAGE

include/configs/colibri_vf.h +0 -2

index 63dbe12..3652d61 100644
@@ -233,8 +233,6 @@
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 
 /* USB Client Support */
-#define CONFIG_CI_UDC
-#define CONFIG_USB_GADGET_DUALSPEED
 #define CONFIG_TRDX_VID                  0x1B67
 #define CONFIG_TRDX_PID_COLIBRI_VF50     0x0016
 #define CONFIG_TRDX_PID_COLIBRI_VF61     0x0017

include/configs/corvus.h +0 -3

index b8c441e..81ebda4 100644
@@ -117,9 +117,6 @@
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
 
-#define CONFIG_USB_GADGET_DUALSPEED
-#define CONFIG_USB_GADGET_ATMEL_USBA
-
 /* DFU class support */
 #define CONFIG_CMD_DFU
 #define CONFIG_USB_FUNCTION_DFU

include/configs/dra7xx_evm.h +0 -2

index e9facae..a230896 100644
@@ -229,14 +229,12 @@
 /* USB GADGET */
 #define CONFIG_USB_DWC3_PHY_OMAP
 #define CONFIG_USB_DWC3_OMAP
-#define CONFIG_USB_DWC3
 #define CONFIG_USB_DWC3_GADGET
 
 #define CONFIG_USB_GADGET_DOWNLOAD
 #define CONFIG_G_DNL_MANUFACTURER "Texas Instruments"
 #define CONFIG_G_DNL_VENDOR_NUM 0x0451
 #define CONFIG_G_DNL_PRODUCT_NUM 0xd022
-#define CONFIG_USB_GADGET_DUALSPEED
 
 /* USB Device Firmware Update support */
 #define CONFIG_USB_FUNCTION_DFU

include/configs/exynos4-common.h +0 -2

index c8e5397..7973991 100644
@@ -50,9 +50,7 @@
 
 #define CONFIG_SYS_MONITOR_LEN		(256 << 10)	/* Reserve 2 sectors */
 
-#define CONFIG_USB_GADGET_DWC2_OTG
 #define CONFIG_USB_GADGET_DWC2_OTG_PHY
-#define CONFIG_USB_GADGET_DUALSPEED
 
 #define CONFIG_CMD_USB_MASS_STORAGE
 #define CONFIG_USB_FUNCTION_MASS_STORAGE

include/configs/gw_ventana.h +0 -2

index 62f3468..711777c 100644
@@ -184,9 +184,7 @@
 #define CONFIG_MXC_USB_PORTSC     (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS      0
 #define CONFIG_USB_KEYBOARD
-#define CONFIG_CI_UDC
 #define CONFIG_USBD_HS
-#define CONFIG_USB_GADGET_DUALSPEED
 #define CONFIG_USB_ETHER
 #define CONFIG_USB_ETH_CDC
 #define CONFIG_NETCONSOLE

include/configs/kc1.h +0 -2

index d8aa182..6a487f2 100644
@@ -184,8 +184,6 @@
 #define CONFIG_USB_MUSB_PIO_ONLY
 #define CONFIG_USB_MUSB_OMAP2PLUS
 
-#define CONFIG_USB_GADGET_DUALSPEED
-
 /*
  * Download
  */

include/configs/kwb.h +0 -2

index 1f2d2a4..4ec4e33 100644
@@ -122,8 +122,6 @@ BUR_COMMON_ENV \
 #define CONFIG_ARCH_MISC_INIT
 #define CONFIG_USB_MUSB_PIO_ONLY
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
-/* attention! not only for gadget, enables also highspeed in hostmode */
-#define CONFIG_USB_GADGET_DUALSPEED
 #define CONFIG_AM335X_USB0
 #define CONFIG_AM335X_USB0_MODE	MUSB_HOST
 #define CONFIG_AM335X_USB1

include/configs/ma5d4evk.h +0 -2

index e061a10..324f1ce 100644
@@ -131,8 +131,6 @@
 #define CONFIG_USB_STORAGE
 
 /* USB device */
-#define CONFIG_USB_GADGET_DUALSPEED
-#define CONFIG_USB_GADGET_ATMEL_USBA
 #define CONFIG_USB_ETHER
 #define CONFIG_USB_ETH_RNDIS
 #define CONFIG_USBNET_MANUFACTURER      "DENX"

include/configs/mx6sabre_common.h +0 -2

index 299f11b..7642d48 100644
@@ -234,9 +234,7 @@
 #define CONFIG_IMX_VIDEO_SKIP
 
 #ifndef CONFIG_SPL
-#define CONFIG_CI_UDC
 #define CONFIG_USBD_HS
-#define CONFIG_USB_GADGET_DUALSPEED
 
 #define CONFIG_CMD_USB_MASS_STORAGE
 #define CONFIG_USB_FUNCTION_MASS_STORAGE

include/configs/mx7dsabresd.h +0 -2

index 506ac32..52646a1 100644
@@ -249,9 +249,7 @@
 
 #define CONFIG_IMX_THERMAL
 
-#define CONFIG_CI_UDC
 #define CONFIG_USBD_HS
-#define CONFIG_USB_GADGET_DUALSPEED
 
 #define CONFIG_CMD_USB_MASS_STORAGE
 #define CONFIG_USB_FUNCTION_MASS_STORAGE

include/configs/nitrogen6x.h +0 -2

index a50829e..38e38ca 100644
@@ -19,9 +19,7 @@
 
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_MISC_INIT_R
-#define CONFIG_CI_UDC
 #define CONFIG_USBD_HS
-#define CONFIG_USB_GADGET_DUALSPEED
 #define CONFIG_USB_ETHER
 #define CONFIG_USB_ETH_CDC
 #define CONFIG_NETCONSOLE

include/configs/novena.h +0 -2

index d11cdc3..d58c95f 100644
@@ -165,9 +165,7 @@
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS		0
 /* Gadget part */
-#define CONFIG_CI_UDC
 #define CONFIG_USBD_HS
-#define CONFIG_USB_GADGET_DUALSPEED
 #define CONFIG_USB_ETHER
 #define CONFIG_USB_ETH_CDC
 #define CONFIG_NETCONSOLE

include/configs/odroid_xu3.h +0 -4

index e4986b0..e704bb4 100644
@@ -48,13 +48,9 @@
 #define CONFIG_USB_EHCI_EXYNOS
 
 /* DWC3 */
-#define CONFIG_USB_DWC3
 #define CONFIG_USB_DWC3_GADGET
 #define CONFIG_USB_DWC3_PHY_SAMSUNG
 
-/* USB gadget */
-#define CONFIG_USB_GADGET_DUALSPEED
-
 /* Downloader */
 #define CONFIG_G_DNL_VENDOR_NUM		0x04E8
 #define CONFIG_G_DNL_PRODUCT_NUM	0x6601

include/configs/omap3_beagle.h +0 -2

index 17d8a86..276429e 100644
@@ -59,10 +59,8 @@
 #define CONFIG_SYS_I2C_NOPROBES		{{0x0, 0x0}}
 
 /* USB */
-#define CONFIG_USB_MUSB_GADGET
 #define CONFIG_USB_MUSB_OMAP2PLUS
 #define CONFIG_USB_MUSB_PIO_ONLY
-#define CONFIG_USB_GADGET_DUALSPEED
 #define CONFIG_TWL4030_USB		1
 #define CONFIG_USB_ETHER
 #define CONFIG_USB_ETHER_RNDIS

include/configs/omap3_logic.h +0 -2

index 7e802e9..b083d57 100644
@@ -79,10 +79,8 @@
 #define CONFIG_OMAP3_LOGIC_USE_NEW_PRODUCT_ID
 
 /* USB */
-#define CONFIG_USB_MUSB_GADGET
 #define CONFIG_USB_MUSB_OMAP2PLUS
 #define CONFIG_USB_MUSB_PIO_ONLY
-#define CONFIG_USB_GADGET_DUALSPEED
 #define CONFIG_USB_ETHER
 #define CONFIG_USB_ETHER_RNDIS
 #define CONFIG_USB_GADGET_DOWNLOAD

include/configs/omap5_uevm.h +0 -2

index 09beb74..85e46b4 100644
@@ -102,14 +102,12 @@
 /* USB GADGET */
 #define CONFIG_USB_DWC3_PHY_OMAP
 #define CONFIG_USB_DWC3_OMAP
-#define CONFIG_USB_DWC3
 #define CONFIG_USB_DWC3_GADGET
 
 #define CONFIG_USB_GADGET_DOWNLOAD
 #define CONFIG_G_DNL_MANUFACTURER "Texas Instruments"
 #define CONFIG_G_DNL_VENDOR_NUM 0x0403
 #define CONFIG_G_DNL_PRODUCT_NUM 0xBD00
-#define CONFIG_USB_GADGET_DUALSPEED
 
 /* USB Device Firmware Update support */
 #define CONFIG_USB_FUNCTION_DFU

include/configs/pcm051.h +0 -2

index 45c140d..3e66c19 100644
@@ -141,9 +141,7 @@
  */
 #define CONFIG_USB_MUSB_DSPS
 #define CONFIG_ARCH_MISC_INIT
-#define CONFIG_USB_MUSB_GADGET
 #define CONFIG_USB_MUSB_PIO_ONLY
-#define CONFIG_USB_GADGET_DUALSPEED
 #define CONFIG_USB_MUSB_HOST
 #define CONFIG_AM335X_USB0
 #define CONFIG_AM335X_USB0_MODE	MUSB_PERIPHERAL

include/configs/pengwyn.h +0 -2

index ec3fcba..8977115 100644
@@ -196,10 +196,8 @@
  */
 #define CONFIG_USB_MUSB_DSPS
 #define CONFIG_ARCH_MISC_INIT
-#define CONFIG_USB_MUSB_GADGET
 #define CONFIG_USB_MUSB_PIO_ONLY
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
-#define CONFIG_USB_GADGET_DUALSPEED
 #define CONFIG_USB_MUSB_HOST
 #define CONFIG_AM335X_USB0
 #define CONFIG_AM335X_USB0_MODE	MUSB_PERIPHERAL

include/configs/s5p_goni.h +0 -2

index 919c60e..e22818e 100644
@@ -270,9 +270,7 @@
 #define CONFIG_SYS_I2C_INIT_BOARD
 
 #define CONFIG_SYS_MAX_I2C_BUS	7
-#define CONFIG_USB_GADGET_DWC2_OTG
 #define CONFIG_USB_GADGET_DWC2_OTG_PHY
-#define CONFIG_USB_GADGET_DUALSPEED
 #define CONFIG_CMD_USB_MASS_STORAGE
 #define CONFIG_USB_FUNCTION_MASS_STORAGE

include/configs/s5pc210_universal.h +0 -2

index ed5365a..25aedc2 100644
@@ -176,9 +176,7 @@
 #define CONFIG_POWER_I2C
 #define CONFIG_POWER_MAX8998
 
-#define CONFIG_USB_GADGET_DWC2_OTG
 #define CONFIG_USB_GADGET_DWC2_OTG_PHY
-#define CONFIG_USB_GADGET_DUALSPEED
 
 /*
  * SPI Settings

include/configs/sama5d2_xplained.h +0 -2

index 1225aa8..427fed9 100644
@@ -74,8 +74,6 @@
 #endif
 
 /* USB device */
-#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 XPlained"

include/configs/sama5d3xek.h +0 -2

index ed6bafb..2567502 100644
@@ -140,8 +140,6 @@
 #endif
 
 /* USB device */
-#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 SAMA5D3xEK"

include/configs/sama5d4_xplained.h +0 -2

index d89609b..e310ee3 100644
@@ -83,8 +83,6 @@
 #endif
 
 /* USB device */
-#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 SAMA5D4EK"

include/configs/sama5d4ek.h +0 -2

index 3981c23..8af3033 100644
@@ -83,8 +83,6 @@
 #endif
 
 /* USB device */
-#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 SAMA5D4EK"

include/configs/sansa_fuze_plus.h +0 -3

index 8088359..c8f4542 100644
@@ -54,9 +54,6 @@
 #define CONFIG_EHCI_MXS_PORT0
 #define CONFIG_USB_MAX_CONTROLLER_COUNT 1
 
-#define CONFIG_CI_UDC		/* ChipIdea CI13xxx UDC */
-#define CONFIG_USB_GADGET_DUALSPEED
-
 #define CONFIG_USB_ETHER
 #define CONFIG_USB_ETH_CDC
 #define CONFIG_NETCONSOLE

include/configs/siemens-am33x-common.h +0 -1

index df4e734..3dbe343 100644
@@ -221,7 +221,6 @@
  */
 #define CONFIG_USB_MUSB_DSPS
 #define CONFIG_ARCH_MISC_INIT
-#define CONFIG_USB_MUSB_GADGET
 #define CONFIG_USB_MUSB_PIO_ONLY
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 #undef CONFIG_USB_GADGET_DUALSPEED

include/configs/sniper.h +0 -2

index 12090a3..6c8b00e 100644
@@ -201,8 +201,6 @@
 #define CONFIG_USB_MUSB_OMAP2PLUS
 #define CONFIG_TWL4030_USB
 
-#define CONFIG_USB_GADGET_DUALSPEED
-
 /*
  * Download
  */

include/configs/socfpga_common.h +0 -3

index bdb06e7..8494486 100644
@@ -250,9 +250,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
  * USB Gadget (DFU, UMS)
  */
 #if defined(CONFIG_CMD_DFU) || defined(CONFIG_CMD_USB_MASS_STORAGE)
-#define CONFIG_USB_GADGET_DWC2_OTG
-#define CONFIG_USB_GADGET_DUALSPEED
-
 /* USB Composite download gadget - g_dnl */
 #define CONFIG_USB_GADGET_DOWNLOAD
 #define CONFIG_USB_FUNCTION_MASS_STORAGE

include/configs/sunxi-common.h +0 -1

index b5d05cd..805ae09 100644
@@ -342,7 +342,6 @@ extern int soft_i2c_gpio_scl;
 #endif
 
 #ifdef CONFIG_USB_MUSB_GADGET
-#define CONFIG_USB_GADGET_DUALSPEED
 
 #define CONFIG_USB_GADGET_DOWNLOAD
 #define CONFIG_USB_FUNCTION_DFU

include/configs/tbs2910.h +0 -2

index 715994c..110c494 100644
@@ -128,10 +128,8 @@
 #define CONFIG_USB_STORAGE
 #define CONFIG_CMD_USB_MASS_STORAGE
 #ifdef CONFIG_CMD_USB_MASS_STORAGE
-#define CONFIG_CI_UDC
 #define CONFIG_USBD_HS
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
-#define CONFIG_USB_GADGET_DUALSPEED
 #define CONFIG_USB_GADGET_DOWNLOAD
 #define CONFIG_G_DNL_VENDOR_NUM		0x0525
 #define CONFIG_G_DNL_PRODUCT_NUM	0xa4a5

include/configs/tegra-common-usb-gadget.h +0 -2

index ec034a1..45db9f1 100644
@@ -10,9 +10,7 @@
 
 #ifndef CONFIG_SPL_BUILD
 /* USB gadget mode support*/
-#define CONFIG_CI_UDC
 #define CONFIG_CI_UDC_HAS_HOSTPC
-#define CONFIG_USB_GADGET_DUALSPEED
 #ifndef CONFIG_G_DNL_VENDOR_NUM
 #define CONFIG_G_DNL_VENDOR_NUM 0x0955
 #endif

include/configs/tseries.h +0 -2

index 901dfd7..e73bc83 100644
@@ -249,8 +249,6 @@ MMCARGS
 #define CONFIG_ARCH_MISC_INIT
 #define CONFIG_USB_MUSB_PIO_ONLY
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
-/* attention! not only for gadget, enables also highspeed in hostmode */
-#define CONFIG_USB_GADGET_DUALSPEED
 #define CONFIG_AM335X_USB0
 #define CONFIG_AM335X_USB0_MODE	MUSB_HOST
 #define CONFIG_AM335X_USB1

include/configs/vinco.h +0 -2

index 5073b9c..69cb63f 100644
@@ -86,8 +86,6 @@
 #endif
 
 /* USB device */
-#define CONFIG_USB_GADGET_DUALSPEED
-#define CONFIG_USB_GADGET_ATMEL_USBA
 #define CONFIG_USB_ETHER
 #define CONFIG_USB_ETH_RNDIS
 #define CONFIG_USBNET_MANUFACTURER      "L+G VInCo"

include/configs/warp.h +0 -2

index 80c4e38..4e3e202 100644
@@ -74,9 +74,7 @@
 #define CONFIG_USB_MAX_CONTROLLER_COUNT	1 /* Only OTG2 port enabled */
 #endif
 
-#define CONFIG_CI_UDC
 #define CONFIG_USBD_HS
-#define CONFIG_USB_GADGET_DUALSPEED
 
 #define CONFIG_CMD_USB_MASS_STORAGE
 #define CONFIG_USB_FUNCTION_MASS_STORAGE

include/configs/xfi3.h +0 -3

index aa49c9e..83c18f0 100644
@@ -53,9 +53,6 @@
 #define CONFIG_EHCI_MXS_PORT0
 #define CONFIG_USB_MAX_CONTROLLER_COUNT 1
 
-#define CONFIG_CI_UDC		/* ChipIdea CI13xxx UDC */
-#define CONFIG_USB_GADGET_DUALSPEED
-
 #define CONFIG_USB_ETHER
 #define CONFIG_USB_ETH_CDC
 #define CONFIG_NETCONSOLE

include/configs/xilinx_zynqmp.h +0 -2

index 3a96483..e0bde12 100644
@@ -125,11 +125,9 @@
 #define CONFIG_USB_STORAGE
 #define CONFIG_USB_XHCI_ZYNQMP
 
-#define CONFIG_USB_DWC3
 #define CONFIG_USB_DWC3_GADGET
 
 #define CONFIG_USB_GADGET_DOWNLOAD
-#define CONFIG_USB_GADGET_DUALSPEED
 #define CONFIG_USBDOWNLOAD_GADGET
 #define CONFIG_SYS_DFU_DATA_BUF_SIZE	0x1800000
 #define DFU_DEFAULT_POLL_TIMEOUT	300

include/configs/zynq-common.h +0 -2

index 941372d..5618c8c 100644
@@ -100,8 +100,6 @@
 # define CONFIG_EHCI_IS_TDI
 # define CONFIG_USB_MAX_CONTROLLER_COUNT	2
 
-# define CONFIG_CI_UDC           /* ChipIdea CI13xxx UDC */
-# define CONFIG_USB_GADGET_DUALSPEED
 # define CONFIG_USB_GADGET_DOWNLOAD
 # define CONFIG_SYS_DFU_DATA_BUF_SIZE	0x600000
 # define DFU_DEFAULT_POLL_TIMEOUT	300

Signature · 1 line

2.8.0.rc3

Semen Protsenko

author

2016-04-11 15:27 UTC #4 lore raw

PATCH v3 3/7 usb: gadget: Move CONFIG_USB_GADGET_DOWNLOAD to Kconfig

In reply to Semen Protsenko

From: Sam Protsenko <[email protected]>

While at it, remove obsolete CONFIG_USBDOWNLOAD_GADGET option from some config headers. This is also probably fixes am335x_baltos board.

Signed-off-by Sam Protsenko <[email protected]>

---
 configs/A13-OLinuXino_defconfig           |  1 +
 configs/CHIP_defconfig                    |  1 +
 configs/Cubietruck_defconfig              |  1 +
 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_gp_evm_defconfig           |  1 +
 configs/am437x_gp_evm_defconfig           |  1 +
 configs/am437x_sk_evm_defconfig           |  1 +
 configs/am43xx_evm_defconfig              |  1 +
 configs/am43xx_evm_ethboot_defconfig      |  1 +
 configs/am43xx_evm_qspiboot_defconfig     |  1 +
 configs/am43xx_evm_usbhost_boot_defconfig |  1 +
 configs/apalis_t30_defconfig              |  1 +
 configs/bcm11130_defconfig                |  1 +
 configs/bcm11130_nand_defconfig           |  1 +
 configs/bcm28155_ap_defconfig             |  1 +
 configs/bcm28155_w1d_defconfig            |  1 +
 configs/beaver_defconfig                  |  1 +
 configs/birdland_bav335a_defconfig        |  1 +
 configs/birdland_bav335b_defconfig        |  1 +
 configs/cgtqmx6eval_defconfig             |  1 +
 configs/colibri_t20_defconfig             |  1 +
 configs/colibri_t30_defconfig             |  1 +
 configs/colibri_vf_defconfig              |  1 +
 configs/corvus_defconfig                  |  1 +
 configs/dalmore_defconfig                 |  1 +
 configs/dra72_evm_defconfig               |  1 +
 configs/dra74_evm_defconfig               |  1 +
 configs/dra7xx_evm_defconfig              |  1 +
 configs/dra7xx_evm_qspiboot_defconfig     |  1 +
 configs/dra7xx_evm_uart3_defconfig        |  1 +
 configs/draco_defconfig                   |  1 +
 configs/e2220-1170_defconfig              |  1 +
 configs/gwventana_defconfig               |  1 +
 configs/jetson-tk1_defconfig              |  1 +
 configs/kc1_defconfig                     |  1 +
 configs/mx6dlsabreauto_defconfig          |  1 +
 configs/mx6dlsabresd_defconfig            |  1 +
 configs/mx6qpsabreauto_defconfig          |  1 +
 configs/mx6qsabreauto_defconfig           |  1 +
 configs/mx6qsabrelite_defconfig           |  1 +
 configs/mx6qsabresd_defconfig             |  1 +
 configs/mx6sabresd_spl_defconfig          |  1 +
 configs/mx7dsabresd_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/nyan-big_defconfig                |  1 +
 configs/odroid-xu3_defconfig              |  1 +
 configs/odroid_defconfig                  |  1 +
 configs/omap3_beagle_defconfig            |  1 +
 configs/omap3_logic_defconfig             |  1 +
 configs/omap5_uevm_defconfig              |  1 +
 configs/origen_defconfig                  |  1 +
 configs/p2371-0000_defconfig              |  1 +
 configs/p2371-2180_defconfig              |  1 +
 configs/p2571_defconfig                   |  1 +
 configs/pxm2_defconfig                    |  1 +
 configs/rastaban_defconfig                |  1 +
 configs/rut_defconfig                     |  1 +
 configs/s5p_goni_defconfig                |  1 +
 configs/s5pc210_universal_defconfig       |  1 +
 configs/smartweb_defconfig                |  1 +
 configs/sniper_defconfig                  |  1 +
 configs/socfpga_arria5_defconfig          |  1 +
 configs/socfpga_cyclone5_defconfig        |  1 +
 configs/socfpga_de0_nano_soc_defconfig    |  1 +
 configs/socfpga_mcvevk_defconfig          |  1 +
 configs/socfpga_sockit_defconfig          |  1 +
 configs/socfpga_socrates_defconfig        |  1 +
 configs/taurus_defconfig                  |  1 +
 configs/tbs2910_defconfig                 |  1 +
 configs/thuban_defconfig                  |  1 +
 configs/trats2_defconfig                  |  1 +
 configs/trats_defconfig                   |  1 +
 configs/venice2_defconfig                 |  1 +
 configs/warp_defconfig                    |  1 +
 configs/xilinx_zynqmp_ep_defconfig        |  1 +
 configs/zynq_picozed_defconfig            |  1 +
 configs/zynq_zc702_defconfig              |  1 +
 configs/zynq_zc706_defconfig              |  1 +
 configs/zynq_zed_defconfig                |  1 +
 configs/zynq_zybo_defconfig               |  1 +
 drivers/usb/gadget/Kconfig                |  6 ++++++
 include/configs/am335x_evm.h              |  1 -
 include/configs/am43xx_evm.h              |  2 +-
 include/configs/baltos.h                  |  1 -
 include/configs/bav335x.h                 |  1 -
 include/configs/bcm28155_ap.h             |  1 -
 include/configs/cgtqmx6eval.h             |  1 -
 include/configs/colibri_vf.h              |  1 -
 include/configs/corvus.h                  |  1 -
 include/configs/dra7xx_evm.h              |  1 -
 include/configs/exynos4-common.h          |  3 ---
 include/configs/gw_ventana.h              |  1 -
 include/configs/kc1.h                     |  2 --
 include/configs/mx6sabre_common.h         |  1 -
 include/configs/mx7dsabresd.h             |  1 -
 include/configs/nitrogen6x.h              |  1 -
 include/configs/odroid_xu3.h              |  1 -
 include/configs/omap3_beagle.h            |  1 -
 include/configs/omap3_logic.h             |  1 -
 include/configs/omap5_uevm.h              |  1 -
 include/configs/s5p_goni.h                |  1 -
 include/configs/siemens-am33x-common.h    |  2 --
 include/configs/smartweb.h                |  1 -
 include/configs/sniper.h                  |  2 --
 include/configs/socfpga_common.h          |  2 --
 include/configs/sunxi-common.h            | 11 +++--------
 include/configs/taurus.h                  |  1 -
 include/configs/tbs2910.h                 |  1 -
 include/configs/tegra-common-usb-gadget.h |  1 -
 include/configs/warp.h                    |  1 -
 include/configs/xilinx_zynqmp.h           |  2 --
 include/configs/zynq-common.h             |  1 -
 124 files changed, 102 insertions(+), 45 deletions(-)

configs/A13-OLinuXino_defconfig +1 -0

index 45ec575..63cd8ef 100644
@@ -23,3 +23,4 @@ CONFIG_CMD_GPIO=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y

configs/CHIP_defconfig +1 -0

index f6346de..6aaf626 100644
@@ -14,3 +14,4 @@ CONFIG_AXP_ALDO3_VOLT=3300
 CONFIG_AXP_ALDO4_VOLT=3300
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y

configs/Cubietruck_defconfig +1 -0

index 0599472..f482065 100644
@@ -20,3 +20,4 @@ CONFIG_ETH_DESIGNWARE=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y

configs/am335x_baltos_defconfig +1 -0

index 3562e58..c0c7468 100644
@@ -15,4 +15,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/am335x_boneblack_defconfig +1 -0

index 46ac471..8f781c8 100644
@@ -20,4 +20,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/am335x_boneblack_vboot_defconfig +1 -0

index 8208b3c..8e252ff 100644
@@ -27,3 +27,4 @@ CONFIG_OMAP_TIMER=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y

configs/am335x_evm_defconfig +1 -0

index b59ff81..426ddc5 100644
@@ -19,4 +19,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/am335x_evm_nor_defconfig +1 -0

index 9458fd1..264fe36 100644
@@ -15,4 +15,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/am335x_evm_norboot_defconfig +1 -0

index 5a84150..222fe82 100644
@@ -12,4 +12,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/am335x_evm_spiboot_defconfig +1 -0

index c9e0761..917128b 100644
@@ -15,4 +15,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/am335x_evm_usbspl_defconfig +1 -0

index e8b2b91..81b3d27 100644
@@ -15,4 +15,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/am335x_gp_evm_defconfig +1 -0

index f888211..a06f722 100644
@@ -21,4 +21,5 @@ CONFIG_OMAP_TIMER=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_RSA=y

configs/am437x_gp_evm_defconfig +1 -0

index e628bd4..b02f8ad 100644
@@ -23,3 +23,4 @@ CONFIG_OMAP_TIMER=y
 CONFIG_USB=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y

configs/am437x_sk_evm_defconfig +1 -0

index d556a7f..1960429 100644
@@ -27,3 +27,4 @@ CONFIG_OMAP_TIMER=y
 CONFIG_USB=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y

configs/am43xx_evm_defconfig +1 -0

index 9b746bf..942a6a0 100644
@@ -14,4 +14,5 @@ CONFIG_TI_QSPI=y
 CONFIG_USB=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/am43xx_evm_ethboot_defconfig +1 -0

index 30a344c..114d10f 100644
@@ -13,4 +13,5 @@ CONFIG_TI_QSPI=y
 CONFIG_USB=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/am43xx_evm_qspiboot_defconfig +1 -0

index 75c75dc..52265c3 100644
@@ -12,4 +12,5 @@ CONFIG_TI_QSPI=y
 CONFIG_USB=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/am43xx_evm_usbhost_boot_defconfig +1 -0

index 9c2234f..9166848 100644
@@ -13,4 +13,5 @@ CONFIG_TI_QSPI=y
 CONFIG_USB=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/apalis_t30_defconfig +1 -0

index a8b4621..882a21e 100644
@@ -19,4 +19,5 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_USE_PRIVATE_LIBGCC=y

configs/bcm11130_defconfig +1 -0

index 11d20c0..74a2881 100644
@@ -11,3 +11,4 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DWC2_OTG=y
+CONFIG_USB_GADGET_DOWNLOAD=y

configs/bcm11130_nand_defconfig +1 -0

index b7336b4..9c66669 100644
@@ -11,3 +11,4 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DWC2_OTG=y
+CONFIG_USB_GADGET_DOWNLOAD=y

configs/bcm28155_ap_defconfig +1 -0

index 15d3b8f..50a6a30 100644
@@ -10,3 +10,4 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DWC2_OTG=y
+CONFIG_USB_GADGET_DOWNLOAD=y

configs/bcm28155_w1d_defconfig +1 -0

index d06130c..cd6a190 100644
@@ -11,3 +11,4 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DWC2_OTG=y
+CONFIG_USB_GADGET_DOWNLOAD=y

configs/beaver_defconfig +1 -0

index 1ab24bd..04ecab9 100644
@@ -23,4 +23,5 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_USE_PRIVATE_LIBGCC=y

configs/birdland_bav335a_defconfig +1 -0

index 807c945..d9a58ad 100644
@@ -14,4 +14,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/birdland_bav335b_defconfig +1 -0

index f923cfd..e605ac6 100644
@@ -14,4 +14,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/cgtqmx6eval_defconfig +1 -0

index c734725..d21e3e9 100644
@@ -11,4 +11,5 @@ CONFIG_CMD_GPIO=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/colibri_t20_defconfig +1 -0

index 6f93f1c..30d8b2b 100644
@@ -22,6 +22,7 @@ CONFIG_USB_ULPI_VIEWPORT=y
 CONFIG_USB_ULPI=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_DM_VIDEO=y
 CONFIG_VIDEO_TEGRA20=y
 CONFIG_USE_PRIVATE_LIBGCC=y

configs/colibri_t30_defconfig +1 -0

index 74f90db..81258a7 100644
@@ -17,4 +17,5 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_USE_PRIVATE_LIBGCC=y

configs/colibri_vf_defconfig +1 -0

index ccba59b..ba6ee38 100644
@@ -20,3 +20,4 @@ CONFIG_FSL_DSPI=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
+CONFIG_USB_GADGET_DOWNLOAD=y

configs/corvus_defconfig +1 -0

index 9f38c37..534a31b 100644
@@ -13,4 +13,5 @@ CONFIG_SYS_PROMPT="U-Boot> "
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_ATMEL_USBA=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/dalmore_defconfig +1 -0

index 5b54e75..ccfc6ba 100644
@@ -21,4 +21,5 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_USE_PRIVATE_LIBGCC=y

configs/dra72_evm_defconfig +1 -0

index 47fb0d7..b2276a9 100644
@@ -26,3 +26,4 @@ CONFIG_OMAP_TIMER=y
 CONFIG_USB=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y

configs/dra74_evm_defconfig +1 -0

index a15b65b..7aa8233 100644
@@ -25,3 +25,4 @@ CONFIG_OMAP_TIMER=y
 CONFIG_USB=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y

configs/dra7xx_evm_defconfig +1 -0

index 2d504a5..160ce93 100644
@@ -16,4 +16,5 @@ CONFIG_TI_QSPI=y
 CONFIG_USB=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/dra7xx_evm_qspiboot_defconfig +1 -0

index 6af9619..4b4fd27 100644
@@ -16,4 +16,5 @@ CONFIG_TI_QSPI=y
 CONFIG_USB=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/dra7xx_evm_uart3_defconfig +1 -0

index 80ae9dd..c86cedc 100644
@@ -17,4 +17,5 @@ CONFIG_TI_QSPI=y
 CONFIG_USB=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/draco_defconfig +1 -0

index be3ec0a..48ae025 100644
@@ -15,4 +15,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/e2220-1170_defconfig +1 -0

index e0790ab..845e6d3 100644
@@ -19,3 +19,4 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
+CONFIG_USB_GADGET_DOWNLOAD=y

configs/gwventana_defconfig +1 -0

index 5228c84..0afc696 100644
@@ -19,4 +19,5 @@ CONFIG_E1000=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/jetson-tk1_defconfig +1 -0

index 3078386..eefe971 100644
@@ -23,4 +23,5 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_USE_PRIVATE_LIBGCC=y

configs/kc1_defconfig +1 -0

index 06698b8..351da87 100644
@@ -13,4 +13,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/mx6dlsabreauto_defconfig +1 -0

index 27ace90..350ca68 100644
@@ -10,4 +10,5 @@ CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/mx6dlsabresd_defconfig +1 -0

index d085ef7..4f46753 100644
@@ -10,4 +10,5 @@ CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/mx6qpsabreauto_defconfig +1 -0

index 4273a32..47843f1 100644
@@ -8,4 +8,5 @@ CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/mx6qsabreauto_defconfig +1 -0

index 60262cd..f719673 100644
@@ -10,4 +10,5 @@ CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/mx6qsabrelite_defconfig +1 -0

index 917362a..d6f76cc 100644
@@ -12,4 +12,5 @@ CONFIG_DM_THERMAL=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/mx6qsabresd_defconfig +1 -0

index 333eb67..6d6afd8 100644
@@ -10,4 +10,5 @@ CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/mx6sabresd_spl_defconfig +1 -0

index 2e0363f..078a362 100644
@@ -11,4 +11,5 @@ CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/mx7dsabresd_defconfig +1 -0

index d0a6305..375c4c7 100644
@@ -15,4 +15,5 @@ CONFIG_CMD_PING=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/nitrogen6dl2g_defconfig +1 -0

index 7ba591a..338911a 100644
@@ -10,4 +10,5 @@ CONFIG_SPI_FLASH_SST=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/nitrogen6dl_defconfig +1 -0

index 3b46fb6..0c38e92 100644
@@ -10,4 +10,5 @@ CONFIG_SPI_FLASH_SST=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/nitrogen6q2g_defconfig +1 -0

index 6049891..710fdef 100644
@@ -10,4 +10,5 @@ CONFIG_SPI_FLASH_SST=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/nitrogen6q_defconfig +1 -0

index ce5b61f..0563ff3 100644
@@ -10,4 +10,5 @@ CONFIG_SPI_FLASH_SST=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/nitrogen6s1g_defconfig +1 -0

index 2e264f2..56c4b15 100644
@@ -10,4 +10,5 @@ CONFIG_SPI_FLASH_SST=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/nitrogen6s_defconfig +1 -0

index 39b381f..0229eaa 100644
@@ -10,4 +10,5 @@ CONFIG_SPI_FLASH_SST=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/nyan-big_defconfig +1 -0

index dc965cc..8ce1c2f 100644
@@ -36,6 +36,7 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_DM_VIDEO=y
 CONFIG_DISPLAY=y
 CONFIG_VIDEO_TEGRA124=y

configs/odroid-xu3_defconfig +1 -0

index 4548cf0..da92b2d 100644
@@ -21,5 +21,6 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_VIDEO_BRIDGE=y
 CONFIG_ERRNO_STR=y

configs/odroid_defconfig +1 -0

index dbdbf96..2aea8c6 100644
@@ -25,4 +25,5 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DWC2_OTG=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_ERRNO_STR=y

configs/omap3_beagle_defconfig +1 -0

index ab3cac4..fdce13c 100644
@@ -10,4 +10,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/omap3_logic_defconfig +1 -0

index fefe209..ccb9686 100644
@@ -14,4 +14,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/omap5_uevm_defconfig +1 -0

index 3fc75df..024de72 100644
@@ -10,4 +10,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/origen_defconfig +1 -0

index 2ce71d4..17141fd 100644
@@ -15,3 +15,4 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DWC2_OTG=y
+CONFIG_USB_GADGET_DOWNLOAD=y

configs/p2371-0000_defconfig +1 -0

index 4cff742..d258c7c 100644
@@ -20,3 +20,4 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
+CONFIG_USB_GADGET_DOWNLOAD=y

configs/p2371-2180_defconfig +1 -0

index cd0d325..26765d6 100644
@@ -22,3 +22,4 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
+CONFIG_USB_GADGET_DOWNLOAD=y

configs/p2571_defconfig +1 -0

index 65d788a..68abec1 100644
@@ -20,3 +20,4 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
+CONFIG_USB_GADGET_DOWNLOAD=y

configs/pxm2_defconfig +1 -0

index 13e27b5..f274784 100644
@@ -16,4 +16,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/rastaban_defconfig +1 -0

index 6f92d84..508ee47 100644
@@ -15,4 +15,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/rut_defconfig +1 -0

index d9367b3..0363980 100644
@@ -16,4 +16,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/s5p_goni_defconfig +1 -0

index 89c1195..47cf3af 100644
@@ -14,3 +14,4 @@ CONFIG_SYS_PROMPT="Goni # "
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DWC2_OTG=y
+CONFIG_USB_GADGET_DOWNLOAD=y

configs/s5pc210_universal_defconfig +1 -0

index dfcf4b7..9927012 100644
@@ -14,3 +14,4 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DWC2_OTG=y
+CONFIG_USB_GADGET_DOWNLOAD=y

configs/smartweb_defconfig +1 -0

index 84ba329..6d25479 100644
@@ -10,4 +10,5 @@ CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc><Esc>\" to stop\
 CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b"
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/sniper_defconfig +1 -0

index 313c489..6816d5a 100644
@@ -13,4 +13,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/socfpga_arria5_defconfig +1 -0

index 372b312..fbf7266 100644
@@ -29,3 +29,4 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DWC2_OTG=y
+CONFIG_USB_GADGET_DOWNLOAD=y

configs/socfpga_cyclone5_defconfig +1 -0

index b4de001..da323db 100644
@@ -29,3 +29,4 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DWC2_OTG=y
+CONFIG_USB_GADGET_DOWNLOAD=y

configs/socfpga_de0_nano_soc_defconfig +1 -0

index a03d161..c5efba5 100644
@@ -24,3 +24,4 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DWC2_OTG=y
+CONFIG_USB_GADGET_DOWNLOAD=y

configs/socfpga_mcvevk_defconfig +1 -0

index d5d5a5c..f1ae006 100644
@@ -24,3 +24,4 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DWC2_OTG=y
+CONFIG_USB_GADGET_DOWNLOAD=y

configs/socfpga_sockit_defconfig +1 -0

index 52d1d18..730d9fc 100644
@@ -29,3 +29,4 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DWC2_OTG=y
+CONFIG_USB_GADGET_DOWNLOAD=y

configs/socfpga_socrates_defconfig +1 -0

index 902b4d2..1cf2ce0 100644
@@ -28,3 +28,4 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DWC2_OTG=y
+CONFIG_USB_GADGET_DOWNLOAD=y

configs/taurus_defconfig +1 -0

index 8a6b337..8cdbb89 100644
@@ -15,5 +15,6 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_USE_TINY_PRINTF=y
 CONFIG_OF_LIBFDT=y

configs/tbs2910_defconfig +1 -0

index dc8be76..5dca48f 100644
@@ -11,4 +11,5 @@ CONFIG_DM_THERMAL=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/thuban_defconfig +1 -0

index 95d516f..0fd57e6 100644
@@ -15,4 +15,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/trats2_defconfig +1 -0

index 60fbab9..d7f8405 100644
@@ -17,3 +17,4 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DWC2_OTG=y
+CONFIG_USB_GADGET_DOWNLOAD=y

configs/trats_defconfig +1 -0

index 079233a..b5431e5 100644
@@ -16,3 +16,4 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DWC2_OTG=y
+CONFIG_USB_GADGET_DOWNLOAD=y

configs/venice2_defconfig +1 -0

index 49ff533..0d20697 100644
@@ -21,4 +21,5 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_USE_PRIVATE_LIBGCC=y

configs/warp_defconfig +1 -0

index c7d185c..c51516c 100644
@@ -11,4 +11,5 @@ CONFIG_CMD_GPIO=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/xilinx_zynqmp_ep_defconfig +1 -0

index da7d259..8f8776d 100644
@@ -32,4 +32,5 @@ CONFIG_ZYNQ_GEM=y
 CONFIG_USB=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 # CONFIG_REGEX is not set

configs/zynq_picozed_defconfig +1 -0

index 28fbd26..3bd6fca 100644
@@ -17,3 +17,4 @@ CONFIG_USB_ULPI_VIEWPORT=y
 CONFIG_USB_ULPI=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
+CONFIG_USB_GADGET_DOWNLOAD=y

configs/zynq_zc702_defconfig +1 -0

index e561784..81d211f 100644
@@ -29,3 +29,4 @@ CONFIG_USB_ULPI_VIEWPORT=y
 CONFIG_USB_ULPI=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
+CONFIG_USB_GADGET_DOWNLOAD=y

configs/zynq_zc706_defconfig +1 -0

index d3a0f23..75d5101 100644
@@ -26,3 +26,4 @@ CONFIG_USB_ULPI_VIEWPORT=y
 CONFIG_USB_ULPI=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
+CONFIG_USB_GADGET_DOWNLOAD=y

configs/zynq_zed_defconfig +1 -0

index 63512dd..51b2788 100644
@@ -26,3 +26,4 @@ CONFIG_USB_ULPI_VIEWPORT=y
 CONFIG_USB_ULPI=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
+CONFIG_USB_GADGET_DOWNLOAD=y

configs/zynq_zybo_defconfig +1 -0

index e397acb..01ca5d2 100644
@@ -28,3 +28,4 @@ CONFIG_USB_ULPI_VIEWPORT=y
 CONFIG_USB_ULPI=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
+CONFIG_USB_GADGET_DOWNLOAD=y

drivers/usb/gadget/Kconfig +6 -0

index 5838d6e..969873c 100644
@@ -80,4 +80,10 @@ config USB_GADGET_VBUS_DRAW
 config USB_GADGET_DUALSPEED
 	bool
 
+config USB_GADGET_DOWNLOAD
+	bool "Enable USB download gadget"
+	help
+	  Composite USB download gadget support (g_dnl) for download functions.
+	  This code works on top of composite gadget.
+
 endif # USB_GADGET

include/configs/am335x_evm.h +0 -1

index f0e13b8..cd78a06 100644
@@ -287,7 +287,6 @@
 #define CONFIG_ARCH_MISC_INIT
 #define CONFIG_USB_MUSB_PIO_ONLY
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
-#define CONFIG_USB_GADGET_DOWNLOAD
 #define CONFIG_USB_MUSB_HOST
 #define CONFIG_AM335X_USB0
 #define CONFIG_AM335X_USB0_MODE	MUSB_PERIPHERAL

include/configs/am43xx_evm.h +1 -1

index 8bea4c2..3643489 100644
@@ -125,6 +125,7 @@
 #if defined(CONFIG_SPL_BUILD) && !defined(CONFIG_SPL_USBETH_SUPPORT)
 #undef CONFIG_USB_DWC3
 
+#undef CONFIG_USB_GADGET_DOWNLOAD
 #undef CONFIG_USB_GADGET_VBUS_DRAW
 #undef CONFIG_USB_GADGET_DUALSPEED
 #endif

@@ -135,7 +136,6 @@
 #define CONFIG_USB_DWC3_OMAP
 #define CONFIG_USB_DWC3_GADGET
 
-#define CONFIG_USB_GADGET_DOWNLOAD
 #define CONFIG_G_DNL_MANUFACTURER "Texas Instruments"
 #define CONFIG_G_DNL_VENDOR_NUM 0x0403
 #define CONFIG_G_DNL_PRODUCT_NUM 0xBD00

include/configs/baltos.h +0 -1

index 8280e60..96a17dd 100644
@@ -273,7 +273,6 @@
 #define CONFIG_ARCH_MISC_INIT
 #define CONFIG_USB_MUSB_PIO_ONLY
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
-#define CONFIG_USBDOWNLOAD_GADGET
 #define CONFIG_USB_MUSB_HOST
 #define CONFIG_AM335X_USB0
 #define CONFIG_AM335X_USB0_MODE	MUSB_HOST

include/configs/bav335x.h +0 -1

index c223931..b466d48 100644
@@ -438,7 +438,6 @@ DEFAULT_LINUX_BOOT_ENV \
 #define CONFIG_ARCH_MISC_INIT
 #define CONFIG_USB_MUSB_PIO_ONLY
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
-#define CONFIG_USB_GADGET_DOWNLOAD
 #define CONFIG_USB_MUSB_HOST
 #define CONFIG_AM335X_USB0
 #define CONFIG_AM335X_USB0_MODE	MUSB_PERIPHERAL

include/configs/bcm28155_ap.h +0 -1

index b431781..680ef16 100644
@@ -139,7 +139,6 @@
 #define CONFIG_FASTBOOT_BUF_SIZE	(CONFIG_SYS_SDRAM_SIZE - SZ_1M)
 #define CONFIG_FASTBOOT_BUF_ADDR	CONFIG_SYS_SDRAM_BASE
 #define CONFIG_USB_GADGET_BCM_UDC_OTG_PHY
-#define CONFIG_USB_GADGET_DOWNLOAD
 #define CONFIG_USBID_ADDR		0x34052c46
 #define CONFIG_G_DNL_VENDOR_NUM		0x18d1	/* google */
 #define CONFIG_G_DNL_PRODUCT_NUM	0x0d02	/* nexus one */

include/configs/cgtqmx6eval.h +0 -1

index db207b9..403de84 100644
@@ -90,7 +90,6 @@
 
 #define CONFIG_CMD_USB_MASS_STORAGE
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
-#define CONFIG_USB_GADGET_DOWNLOAD
 
 #define CONFIG_G_DNL_VENDOR_NUM		0x0525
 #define CONFIG_G_DNL_PRODUCT_NUM	0xa4a5

include/configs/colibri_vf.h +0 -1

index 3652d61..74a3874 100644
@@ -243,7 +243,6 @@
 #define CONFIG_G_DNL_PRODUCT_NUM         CONFIG_TRDX_PID_COLIBRI_VF50
 
 /* USB DFU */
-#define CONFIG_USB_GADGET_DOWNLOAD
 #define CONFIG_CMD_DFU
 #define CONFIG_USB_FUNCTION_DFU
 #define CONFIG_DFU_NAND

include/configs/corvus.h +0 -1

index 81ebda4..0b28529 100644
@@ -121,7 +121,6 @@
 #define CONFIG_CMD_DFU
 #define CONFIG_USB_FUNCTION_DFU
 #define CONFIG_DFU_NAND
-#define CONFIG_USB_GADGET_DOWNLOAD
 #define CONFIG_SYS_DFU_DATA_BUF_SIZE	(SZ_1M)
 #define DFU_MANIFEST_POLL_TIMEOUT	25000

include/configs/dra7xx_evm.h +0 -1

index a230896..70c25bf 100644
@@ -231,7 +231,6 @@
 #define CONFIG_USB_DWC3_OMAP
 #define CONFIG_USB_DWC3_GADGET
 
-#define CONFIG_USB_GADGET_DOWNLOAD
 #define CONFIG_G_DNL_MANUFACTURER "Texas Instruments"
 #define CONFIG_G_DNL_VENDOR_NUM 0x0451
 #define CONFIG_G_DNL_PRODUCT_NUM 0xd022

include/configs/exynos4-common.h +0 -3

index 7973991..a0f4aa8 100644
@@ -27,9 +27,6 @@
 #define CONFIG_CMD_DFU
 #define CONFIG_CMD_GPT
 
-/* USB Composite download gadget - g_dnl */
-#define CONFIG_USB_GADGET_DOWNLOAD
-
 /* TIZEN THOR downloader support */
 #define CONFIG_CMD_THOR_DOWNLOAD
 #define CONFIG_USB_FUNCTION_THOR

include/configs/gw_ventana.h +0 -1

index 711777c..0921093 100644
@@ -193,7 +193,6 @@
 /* USB Mass Storage Gadget */
 #define CONFIG_CMD_USB_MASS_STORAGE
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
-#define CONFIG_USB_GADGET_DOWNLOAD
 
 /* Netchip IDs */
 #define CONFIG_G_DNL_VENDOR_NUM 0x0525

include/configs/kc1.h +0 -2

index 6a487f2..ab4cbab 100644
@@ -188,8 +188,6 @@
  * Download
  */
 
-#define CONFIG_USB_GADGET_DOWNLOAD
-
 #define CONFIG_G_DNL_VENDOR_NUM		0x0451
 #define CONFIG_G_DNL_PRODUCT_NUM	0xd022
 #define CONFIG_G_DNL_MANUFACTURER	"Texas Instruments"

include/configs/mx6sabre_common.h +0 -1

index 7642d48..1f12abd 100644
@@ -238,7 +238,6 @@
 
 #define CONFIG_CMD_USB_MASS_STORAGE
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
-#define CONFIG_USB_GADGET_DOWNLOAD
 
 #define CONFIG_G_DNL_VENDOR_NUM		0x0525
 #define CONFIG_G_DNL_PRODUCT_NUM	0xa4a5

include/configs/mx7dsabresd.h +0 -1

index 52646a1..1cefa94 100644
@@ -253,7 +253,6 @@
 
 #define CONFIG_CMD_USB_MASS_STORAGE
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
-#define CONFIG_USB_GADGET_DOWNLOAD
 
 #define CONFIG_G_DNL_VENDOR_NUM		0x0525
 #define CONFIG_G_DNL_PRODUCT_NUM	0xa4a5

include/configs/nitrogen6x.h +0 -1

index 38e38ca..f906bf2 100644
@@ -330,7 +330,6 @@
 
 #define CONFIG_CMD_USB_MASS_STORAGE
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
-#define CONFIG_USB_GADGET_DOWNLOAD
 
 /* Netchip IDs */
 #define CONFIG_G_DNL_VENDOR_NUM 0x0525

include/configs/odroid_xu3.h +0 -1

index e704bb4..7e91f61 100644
@@ -55,7 +55,6 @@
 #define CONFIG_G_DNL_VENDOR_NUM		0x04E8
 #define CONFIG_G_DNL_PRODUCT_NUM	0x6601
 #define CONFIG_G_DNL_MANUFACTURER	"Samsung"
-#define CONFIG_USB_GADGET_DOWNLOAD
 
 /* DFU */
 #define CONFIG_USB_FUNCTION_DFU

include/configs/omap3_beagle.h +0 -1

index 276429e..aec8352 100644
@@ -64,7 +64,6 @@
 #define CONFIG_TWL4030_USB		1
 #define CONFIG_USB_ETHER
 #define CONFIG_USB_ETHER_RNDIS
-#define CONFIG_USB_GADGET_DOWNLOAD
 #define CONFIG_G_DNL_VENDOR_NUM		0x0451
 #define CONFIG_G_DNL_PRODUCT_NUM	0xd022
 #define CONFIG_G_DNL_MANUFACTURER	"TI"

include/configs/omap3_logic.h +0 -1

index b083d57..9337b89 100644
@@ -83,7 +83,6 @@
 #define CONFIG_USB_MUSB_PIO_ONLY
 #define CONFIG_USB_ETHER
 #define CONFIG_USB_ETHER_RNDIS
-#define CONFIG_USB_GADGET_DOWNLOAD
 #define CONFIG_G_DNL_VENDOR_NUM		0x0451
 #define CONFIG_G_DNL_PRODUCT_NUM	0xd022
 #define CONFIG_G_DNL_MANUFACTURER	"TI"

include/configs/omap5_uevm.h +0 -1

index 85e46b4..8a98934 100644
@@ -104,7 +104,6 @@
 #define CONFIG_USB_DWC3_OMAP
 #define CONFIG_USB_DWC3_GADGET
 
-#define CONFIG_USB_GADGET_DOWNLOAD
 #define CONFIG_G_DNL_MANUFACTURER "Texas Instruments"
 #define CONFIG_G_DNL_VENDOR_NUM 0x0403
 #define CONFIG_G_DNL_PRODUCT_NUM 0xBD00

include/configs/s5p_goni.h +0 -1

index e22818e..d101cf2 100644
@@ -70,7 +70,6 @@
 #define CONFIG_CMD_GPT
 
 /* USB Composite download gadget - g_dnl */
-#define CONFIG_USB_GADGET_DOWNLOAD
 #define CONFIG_USB_FUNCTION_DFU
 #define CONFIG_DFU_MMC
 #define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_32M

include/configs/siemens-am33x-common.h +0 -2

index 3dbe343..d630f04 100644
@@ -241,8 +241,6 @@
 #define CONFIG_USBNET_HOST_ADDR	"de:ad:be:af:00:00"
 #endif /* CONFIG_USB_MUSB_GADGET */
 
-#define CONFIG_USB_GADGET_DOWNLOAD
-
 /* USB DRACO ID as default */
 #define CONFIG_USBD_HS
 #define CONFIG_G_DNL_VENDOR_NUM 0x0908

include/configs/smartweb.h +0 -1

index 0586aec..bafa8e3 100644
@@ -175,7 +175,6 @@
 #define CONFIG_CMD_DFU
 #define CONFIG_USB_FUNCTION_DFU
 #define CONFIG_DFU_NAND
-#define CONFIG_USB_GADGET_DOWNLOAD
 #define CONFIG_SYS_DFU_DATA_BUF_SIZE	SZ_1M
 #define DFU_MANIFEST_POLL_TIMEOUT	25000

include/configs/sniper.h +0 -2

index 6c8b00e..e61b115 100644
@@ -205,8 +205,6 @@
  * Download
  */
 
-#define CONFIG_USB_GADGET_DOWNLOAD
-
 #define CONFIG_G_DNL_VENDOR_NUM		0x0451
 #define CONFIG_G_DNL_PRODUCT_NUM	0xd022
 #define CONFIG_G_DNL_MANUFACTURER	"Texas Instruments"

include/configs/socfpga_common.h +0 -2

index 8494486..2da40f3 100644
@@ -250,8 +250,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
  * USB Gadget (DFU, UMS)
  */
 #if defined(CONFIG_CMD_DFU) || defined(CONFIG_CMD_USB_MASS_STORAGE)
-/* USB Composite download gadget - g_dnl */
-#define CONFIG_USB_GADGET_DOWNLOAD
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
 
 #define CONFIG_USB_FUNCTION_DFU

include/configs/sunxi-common.h +3 -8

index 805ae09..6e880a7 100644
@@ -342,17 +342,12 @@ extern int soft_i2c_gpio_scl;
 #endif
 
 #ifdef CONFIG_USB_MUSB_GADGET
-
-#define CONFIG_USB_GADGET_DOWNLOAD
-#define CONFIG_USB_FUNCTION_DFU
-#define CONFIG_USB_FUNCTION_FASTBOOT
-#define CONFIG_USB_FUNCTION_MASS_STORAGE
-#endif
-
-#ifdef CONFIG_USB_GADGET_DOWNLOAD
 #define CONFIG_G_DNL_VENDOR_NUM		0x1f3a
 #define CONFIG_G_DNL_PRODUCT_NUM	0x1010
 #define CONFIG_G_DNL_MANUFACTURER	"Allwinner Technology"
+#define CONFIG_USB_FUNCTION_DFU
+#define CONFIG_USB_FUNCTION_FASTBOOT
+#define CONFIG_USB_FUNCTION_MASS_STORAGE
 #endif
 
 #ifdef CONFIG_USB_FUNCTION_DFU

include/configs/taurus.h +0 -1

index 0b04b3a..422b7a1 100644
@@ -139,7 +139,6 @@
 #define CONFIG_CMD_DFU
 #define CONFIG_USB_FUNCTION_DFU
 #define CONFIG_DFU_NAND
-#define CONFIG_USB_GADGET_DOWNLOAD
 #define CONFIG_SYS_DFU_DATA_BUF_SIZE	(SZ_1M)
 #define DFU_MANIFEST_POLL_TIMEOUT	25000

include/configs/tbs2910.h +0 -1

index 110c494..19f35bb 100644
@@ -130,7 +130,6 @@
 #ifdef CONFIG_CMD_USB_MASS_STORAGE
 #define CONFIG_USBD_HS
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
-#define CONFIG_USB_GADGET_DOWNLOAD
 #define CONFIG_G_DNL_VENDOR_NUM		0x0525
 #define CONFIG_G_DNL_PRODUCT_NUM	0xa4a5
 #define CONFIG_G_DNL_MANUFACTURER	"TBS"

include/configs/tegra-common-usb-gadget.h +0 -1

index 45db9f1..6b1247c 100644
@@ -20,7 +20,6 @@
 #ifndef CONFIG_G_DNL_MANUFACTURER
 #define CONFIG_G_DNL_MANUFACTURER "NVIDIA"
 #endif
-#define CONFIG_USB_GADGET_DOWNLOAD
 /* USB mass storage protocol */
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
 #define CONFIG_CMD_USB_MASS_STORAGE

include/configs/warp.h +0 -1

index 4e3e202..11ebbeb 100644
@@ -78,7 +78,6 @@
 
 #define CONFIG_CMD_USB_MASS_STORAGE
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
-#define CONFIG_USB_GADGET_DOWNLOAD
 
 #define CONFIG_G_DNL_VENDOR_NUM		0x0525
 #define CONFIG_G_DNL_PRODUCT_NUM	0xa4a5

include/configs/xilinx_zynqmp.h +0 -2

index e0bde12..b4f41cc 100644
@@ -127,8 +127,6 @@
 
 #define CONFIG_USB_DWC3_GADGET
 
-#define CONFIG_USB_GADGET_DOWNLOAD
-#define CONFIG_USBDOWNLOAD_GADGET
 #define CONFIG_SYS_DFU_DATA_BUF_SIZE	0x1800000
 #define DFU_DEFAULT_POLL_TIMEOUT	300
 #define CONFIG_USB_FUNCTION_DFU

include/configs/zynq-common.h +0 -1

index 5618c8c..13e1b32 100644
@@ -100,7 +100,6 @@
 # define CONFIG_EHCI_IS_TDI
 # define CONFIG_USB_MAX_CONTROLLER_COUNT	2
 
-# define CONFIG_USB_GADGET_DOWNLOAD
 # define CONFIG_SYS_DFU_DATA_BUF_SIZE	0x600000
 # define DFU_DEFAULT_POLL_TIMEOUT	300
 # define CONFIG_USB_FUNCTION_DFU

Signature · 1 line

2.8.0.rc3

Semen Protsenko

author

2016-04-11 15:27 UTC #5 lore raw

PATCH v3 4/7 usb: dwc3: Move CONFIG_USB_DWC3_GADGET/HOST to Kconfig

In reply to Semen Protsenko

From: Sam Protsenko <[email protected]>

Description was borrowed from kernel dwc3 Kconfig.

Signed-off-by Sam Protsenko <[email protected]>

---
 configs/am437x_gp_evm_defconfig           |  1 +
 configs/am437x_sk_evm_defconfig           |  1 +
 configs/am43xx_evm_defconfig              |  1 +
 configs/am43xx_evm_ethboot_defconfig      |  1 +
 configs/am43xx_evm_qspiboot_defconfig     |  1 +
 configs/am43xx_evm_usbhost_boot_defconfig |  1 +
 configs/dra72_evm_defconfig               |  1 +
 configs/dra74_evm_defconfig               |  1 +
 configs/dra7xx_evm_defconfig              |  1 +
 configs/dra7xx_evm_qspiboot_defconfig     |  1 +
 configs/dra7xx_evm_uart3_defconfig        |  1 +
 configs/odroid-xu3_defconfig              |  1 +
 configs/omap5_uevm_defconfig              |  1 +
 configs/xilinx_zynqmp_ep_defconfig        |  1 +
 drivers/usb/dwc3/Kconfig                  | 23 +++++++++++++++++++++++
 include/configs/am43xx_evm.h              |  2 +-
 include/configs/dra7xx_evm.h              |  1 -
 include/configs/odroid_xu3.h              |  1 -
 include/configs/omap5_uevm.h              |  1 -
 include/configs/xilinx_zynqmp.h           |  2 --
 20 files changed, 38 insertions(+), 6 deletions(-)

configs/am437x_gp_evm_defconfig +1 -0

index b02f8ad..8dc905e 100644
@@ -22,5 +22,6 @@ CONFIG_TIMER=y
 CONFIG_OMAP_TIMER=y
 CONFIG_USB=y
 CONFIG_USB_DWC3=y
+CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y

configs/am437x_sk_evm_defconfig +1 -0

index 1960429..33cc903 100644
@@ -26,5 +26,6 @@ CONFIG_TIMER=y
 CONFIG_OMAP_TIMER=y
 CONFIG_USB=y
 CONFIG_USB_DWC3=y
+CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y

configs/am43xx_evm_defconfig +1 -0

index 942a6a0..5406beb 100644
@@ -13,6 +13,7 @@ CONFIG_SYS_NS16550=y
 CONFIG_TI_QSPI=y
 CONFIG_USB=y
 CONFIG_USB_DWC3=y
+CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/am43xx_evm_ethboot_defconfig +1 -0

index 114d10f..fa01c75 100644
@@ -12,6 +12,7 @@ CONFIG_SYS_NS16550=y
 CONFIG_TI_QSPI=y
 CONFIG_USB=y
 CONFIG_USB_DWC3=y
+CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/am43xx_evm_qspiboot_defconfig +1 -0

index 52265c3..76d2e72 100644
@@ -11,6 +11,7 @@ CONFIG_SYS_NS16550=y
 CONFIG_TI_QSPI=y
 CONFIG_USB=y
 CONFIG_USB_DWC3=y
+CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/am43xx_evm_usbhost_boot_defconfig +1 -0

index 9166848..c437b3a 100644
@@ -12,6 +12,7 @@ CONFIG_SYS_NS16550=y
 CONFIG_TI_QSPI=y
 CONFIG_USB=y
 CONFIG_USB_DWC3=y
+CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/dra72_evm_defconfig +1 -0

index b2276a9..9fdd842 100644
@@ -25,5 +25,6 @@ CONFIG_TIMER=y
 CONFIG_OMAP_TIMER=y
 CONFIG_USB=y
 CONFIG_USB_DWC3=y
+CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y

configs/dra74_evm_defconfig +1 -0

index 7aa8233..810db5b 100644
@@ -24,5 +24,6 @@ CONFIG_TIMER=y
 CONFIG_OMAP_TIMER=y
 CONFIG_USB=y
 CONFIG_USB_DWC3=y
+CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y

configs/dra7xx_evm_defconfig +1 -0

index 160ce93..88bf379 100644
@@ -15,6 +15,7 @@ CONFIG_SYS_NS16550=y
 CONFIG_TI_QSPI=y
 CONFIG_USB=y
 CONFIG_USB_DWC3=y
+CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/dra7xx_evm_qspiboot_defconfig +1 -0

index 4b4fd27..80961f7 100644
@@ -15,6 +15,7 @@ CONFIG_SYS_NS16550=y
 CONFIG_TI_QSPI=y
 CONFIG_USB=y
 CONFIG_USB_DWC3=y
+CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/dra7xx_evm_uart3_defconfig +1 -0

index c86cedc..f187083 100644
@@ -16,6 +16,7 @@ CONFIG_SYS_NS16550=y
 CONFIG_TI_QSPI=y
 CONFIG_USB=y
 CONFIG_USB_DWC3=y
+CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/odroid-xu3_defconfig +1 -0

index da92b2d..cb6035b 100644
@@ -20,6 +20,7 @@ CONFIG_DM_REGULATOR=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_DWC3=y
+CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_VIDEO_BRIDGE=y

configs/omap5_uevm_defconfig +1 -0

index 024de72..5ab2b9d 100644
@@ -9,6 +9,7 @@ CONFIG_CMD_GPIO=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_DWC3=y
+CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/xilinx_zynqmp_ep_defconfig +1 -0

index 8f8776d..34cff0c 100644
@@ -31,6 +31,7 @@ CONFIG_NAND_ARASAN=y
 CONFIG_ZYNQ_GEM=y
 CONFIG_USB=y
 CONFIG_USB_DWC3=y
+CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 # CONFIG_REGEX is not set

drivers/usb/dwc3/Kconfig +23 -0

index debc74b..c0251b1 100644
@@ -5,3 +5,26 @@ config USB_DWC3
 	help
 	  Say Y here if your system has a Dual Role SuperSpeed
 	  USB controller based on the DesignWare USB3 IP Core.
+
+if USB_DWC3
+
+choice
+	bool "DWC3 Mode Selection"
+
+config USB_DWC3_HOST
+	bool "Host only mode"
+	depends on USB
+	help
+	  Select this when you want to use DWC3 in host mode only,
+	  thereby the gadget feature will be regressed.
+
+config USB_DWC3_GADGET
+	bool "Gadget only mode"
+	depends on USB_GADGET
+	help
+	  Select this when you want to use DWC3 in gadget mode only,
+	  thereby the host feature will be regressed.
+
+endchoice
+
+endif

include/configs/am43xx_evm.h +1 -1

index 3643489..5e0f65d 100644
@@ -124,6 +124,7 @@
 /* USB GADGET */
 #if defined(CONFIG_SPL_BUILD) && !defined(CONFIG_SPL_USBETH_SUPPORT)
 #undef CONFIG_USB_DWC3
+#undef CONFIG_USB_DWC3_GADGET
 
 #undef CONFIG_USB_GADGET_DOWNLOAD
 #undef CONFIG_USB_GADGET_VBUS_DRAW

@@ -134,7 +135,6 @@
 	(defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT))
 #define CONFIG_USB_DWC3_PHY_OMAP
 #define CONFIG_USB_DWC3_OMAP
-#define CONFIG_USB_DWC3_GADGET
 
 #define CONFIG_G_DNL_MANUFACTURER "Texas Instruments"
 #define CONFIG_G_DNL_VENDOR_NUM 0x0403

include/configs/dra7xx_evm.h +0 -1

index 70c25bf..3fb97e8 100644
@@ -229,7 +229,6 @@
 /* USB GADGET */
 #define CONFIG_USB_DWC3_PHY_OMAP
 #define CONFIG_USB_DWC3_OMAP
-#define CONFIG_USB_DWC3_GADGET
 
 #define CONFIG_G_DNL_MANUFACTURER "Texas Instruments"
 #define CONFIG_G_DNL_VENDOR_NUM 0x0451

include/configs/odroid_xu3.h +0 -1

index 7e91f61..57e20e7 100644
@@ -48,7 +48,6 @@
 #define CONFIG_USB_EHCI_EXYNOS
 
 /* DWC3 */
-#define CONFIG_USB_DWC3_GADGET
 #define CONFIG_USB_DWC3_PHY_SAMSUNG
 
 /* Downloader */

include/configs/omap5_uevm.h +0 -1

index 8a98934..6853260 100644
@@ -102,7 +102,6 @@
 /* USB GADGET */
 #define CONFIG_USB_DWC3_PHY_OMAP
 #define CONFIG_USB_DWC3_OMAP
-#define CONFIG_USB_DWC3_GADGET
 
 #define CONFIG_G_DNL_MANUFACTURER "Texas Instruments"
 #define CONFIG_G_DNL_VENDOR_NUM 0x0403

include/configs/xilinx_zynqmp.h +0 -2

index b4f41cc..d877eeb 100644
@@ -125,8 +125,6 @@
 #define CONFIG_USB_STORAGE
 #define CONFIG_USB_XHCI_ZYNQMP
 
-#define CONFIG_USB_DWC3_GADGET
-
 #define CONFIG_SYS_DFU_DATA_BUF_SIZE	0x1800000
 #define DFU_DEFAULT_POLL_TIMEOUT	300
 #define CONFIG_USB_FUNCTION_DFU

Signature · 1 line

2.8.0.rc3

Semen Protsenko

author

2016-04-11 15:27 UTC #6 lore raw

PATCH v3 5/7 usb: dwc3: Move CONFIG_USB_DWC3_OMAP to Kconfig

In reply to Semen Protsenko

From: Sam Protsenko <[email protected]>

Signed-off-by Sam Protsenko <[email protected]>

---
 configs/am437x_gp_evm_defconfig           |  1 +
 configs/am437x_sk_evm_defconfig           |  1 +
 configs/am43xx_evm_defconfig              |  1 +
 configs/am43xx_evm_ethboot_defconfig      |  1 +
 configs/am43xx_evm_qspiboot_defconfig     |  1 +
 configs/am43xx_evm_usbhost_boot_defconfig |  1 +
 configs/dra72_evm_defconfig               |  1 +
 configs/dra74_evm_defconfig               |  1 +
 configs/dra7xx_evm_defconfig              |  1 +
 configs/dra7xx_evm_qspiboot_defconfig     |  1 +
 configs/dra7xx_evm_uart3_defconfig        |  1 +
 configs/omap5_uevm_defconfig              |  1 +
 drivers/usb/dwc3/Kconfig                  | 10 ++++++++++
 include/configs/am43xx_evm.h              |  2 +-
 include/configs/dra7xx_evm.h              |  1 -
 include/configs/omap5_uevm.h              |  1 -
 16 files changed, 23 insertions(+), 3 deletions(-)

configs/am437x_gp_evm_defconfig +1 -0

index 8dc905e..ce16f93 100644
@@ -23,5 +23,6 @@ CONFIG_OMAP_TIMER=y
 CONFIG_USB=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
+CONFIG_USB_DWC3_OMAP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y

configs/am437x_sk_evm_defconfig +1 -0

index 33cc903..ee956a0 100644
@@ -27,5 +27,6 @@ CONFIG_OMAP_TIMER=y
 CONFIG_USB=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
+CONFIG_USB_DWC3_OMAP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y

configs/am43xx_evm_defconfig +1 -0

index 5406beb..0940351 100644
@@ -14,6 +14,7 @@ CONFIG_TI_QSPI=y
 CONFIG_USB=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
+CONFIG_USB_DWC3_OMAP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/am43xx_evm_ethboot_defconfig +1 -0

index fa01c75..dc25719 100644
@@ -13,6 +13,7 @@ CONFIG_TI_QSPI=y
 CONFIG_USB=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
+CONFIG_USB_DWC3_OMAP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/am43xx_evm_qspiboot_defconfig +1 -0

index 76d2e72..4cd48c3 100644
@@ -12,6 +12,7 @@ CONFIG_TI_QSPI=y
 CONFIG_USB=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
+CONFIG_USB_DWC3_OMAP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/am43xx_evm_usbhost_boot_defconfig +1 -0

index c437b3a..6371d54 100644
@@ -13,6 +13,7 @@ CONFIG_TI_QSPI=y
 CONFIG_USB=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
+CONFIG_USB_DWC3_OMAP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/dra72_evm_defconfig +1 -0

index 9fdd842..040412d 100644
@@ -26,5 +26,6 @@ CONFIG_OMAP_TIMER=y
 CONFIG_USB=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
+CONFIG_USB_DWC3_OMAP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y

configs/dra74_evm_defconfig +1 -0

index 810db5b..28646b0 100644
@@ -25,5 +25,6 @@ CONFIG_OMAP_TIMER=y
 CONFIG_USB=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
+CONFIG_USB_DWC3_OMAP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y

configs/dra7xx_evm_defconfig +1 -0

index 88bf379..a460897 100644
@@ -16,6 +16,7 @@ CONFIG_TI_QSPI=y
 CONFIG_USB=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
+CONFIG_USB_DWC3_OMAP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/dra7xx_evm_qspiboot_defconfig +1 -0

index 80961f7..56a5965 100644
@@ -16,6 +16,7 @@ CONFIG_TI_QSPI=y
 CONFIG_USB=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
+CONFIG_USB_DWC3_OMAP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/dra7xx_evm_uart3_defconfig +1 -0

index f187083..1121289 100644
@@ -17,6 +17,7 @@ CONFIG_TI_QSPI=y
 CONFIG_USB=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
+CONFIG_USB_DWC3_OMAP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/omap5_uevm_defconfig +1 -0

index 5ab2b9d..9a5b91b 100644
@@ -10,6 +10,7 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
+CONFIG_USB_DWC3_OMAP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

drivers/usb/dwc3/Kconfig +10 -0

index c0251b1..0bb862a 100644
@@ -27,4 +27,14 @@ config USB_DWC3_GADGET
 
 endchoice
 
+comment "Platform Glue Driver Support"
+
+config USB_DWC3_OMAP
+	bool "Texas Instruments OMAP5 and similar Platforms"
+	help
+	  Some platforms from Texas Instruments like OMAP5, DRA7xxx and
+	  AM437x use this IP for USB2/3 functionality.
+
+	  Say 'Y' here if you have one such device
+
 endif

include/configs/am43xx_evm.h +1 -1

index 5e0f65d..b330f1b 100644
@@ -123,6 +123,7 @@
 
 /* USB GADGET */
 #if defined(CONFIG_SPL_BUILD) && !defined(CONFIG_SPL_USBETH_SUPPORT)
+#undef CONFIG_USB_DWC3_OMAP
 #undef CONFIG_USB_DWC3
 #undef CONFIG_USB_DWC3_GADGET

@@ -134,7 +135,6 @@
 #if !defined(CONFIG_SPL_BUILD) || \
 	(defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT))
 #define CONFIG_USB_DWC3_PHY_OMAP
-#define CONFIG_USB_DWC3_OMAP
 
 #define CONFIG_G_DNL_MANUFACTURER "Texas Instruments"
 #define CONFIG_G_DNL_VENDOR_NUM 0x0403

include/configs/dra7xx_evm.h +0 -1

index 3fb97e8..118bf91 100644
@@ -228,7 +228,6 @@
 
 /* USB GADGET */
 #define CONFIG_USB_DWC3_PHY_OMAP
-#define CONFIG_USB_DWC3_OMAP
 
 #define CONFIG_G_DNL_MANUFACTURER "Texas Instruments"
 #define CONFIG_G_DNL_VENDOR_NUM 0x0451

include/configs/omap5_uevm.h +0 -1

index 6853260..533ac7b 100644
@@ -101,7 +101,6 @@
 
 /* USB GADGET */
 #define CONFIG_USB_DWC3_PHY_OMAP
-#define CONFIG_USB_DWC3_OMAP
 
 #define CONFIG_G_DNL_MANUFACTURER "Texas Instruments"
 #define CONFIG_G_DNL_VENDOR_NUM 0x0403

Signature · 1 line

2.8.0.rc3

Semen Protsenko

author

2016-04-11 15:27 UTC #7 lore raw

PATCH v3 6/7 usb: dwc3: Move CONFIG_USB_DWC3_PHY_* to Kconfig

In reply to Semen Protsenko

From: Sam Protsenko <[email protected]>

Signed-off-by Sam Protsenko <[email protected]>

---
 configs/am437x_gp_evm_defconfig           |  1 +
 configs/am437x_sk_evm_defconfig           |  1 +
 configs/am43xx_evm_defconfig              |  1 +
 configs/am43xx_evm_ethboot_defconfig      |  1 +
 configs/am43xx_evm_qspiboot_defconfig     |  1 +
 configs/am43xx_evm_usbhost_boot_defconfig |  1 +
 configs/dra72_evm_defconfig               |  1 +
 configs/dra74_evm_defconfig               |  1 +
 configs/dra7xx_evm_defconfig              |  1 +
 configs/dra7xx_evm_qspiboot_defconfig     |  1 +
 configs/dra7xx_evm_uart3_defconfig        |  1 +
 configs/odroid-xu3_defconfig              |  1 +
 configs/omap5_uevm_defconfig              |  1 +
 drivers/usb/dwc3/Kconfig                  | 17 +++++++++++++++++
 include/configs/am43xx_evm.h              |  3 +--
 include/configs/dra7xx_evm.h              |  2 --
 include/configs/odroid_xu3.h              |  3 ---
 include/configs/omap5_uevm.h              |  2 --
 18 files changed, 31 insertions(+), 9 deletions(-)

configs/am437x_gp_evm_defconfig +1 -0

index ce16f93..c1b26e0 100644
@@ -24,5 +24,6 @@ CONFIG_USB=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_DWC3_OMAP=y
+CONFIG_USB_DWC3_PHY_OMAP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y

configs/am437x_sk_evm_defconfig +1 -0

index ee956a0..80ff4da 100644
@@ -28,5 +28,6 @@ CONFIG_USB=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_DWC3_OMAP=y
+CONFIG_USB_DWC3_PHY_OMAP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y

configs/am43xx_evm_defconfig +1 -0

index 0940351..97ea209 100644
@@ -15,6 +15,7 @@ CONFIG_USB=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_DWC3_OMAP=y
+CONFIG_USB_DWC3_PHY_OMAP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/am43xx_evm_ethboot_defconfig +1 -0

index dc25719..5963437 100644
@@ -14,6 +14,7 @@ CONFIG_USB=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_DWC3_OMAP=y
+CONFIG_USB_DWC3_PHY_OMAP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/am43xx_evm_qspiboot_defconfig +1 -0

index 4cd48c3..02ce1ef 100644
@@ -13,6 +13,7 @@ CONFIG_USB=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_DWC3_OMAP=y
+CONFIG_USB_DWC3_PHY_OMAP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/am43xx_evm_usbhost_boot_defconfig +1 -0

index 6371d54..9ac5c99 100644
@@ -14,6 +14,7 @@ CONFIG_USB=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_DWC3_OMAP=y
+CONFIG_USB_DWC3_PHY_OMAP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/dra72_evm_defconfig +1 -0

index 040412d..1b8d2b9 100644
@@ -27,5 +27,6 @@ CONFIG_USB=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_DWC3_OMAP=y
+CONFIG_USB_DWC3_PHY_OMAP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y

configs/dra74_evm_defconfig +1 -0

index 28646b0..2abf81e 100644
@@ -26,5 +26,6 @@ CONFIG_USB=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_DWC3_OMAP=y
+CONFIG_USB_DWC3_PHY_OMAP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y

configs/dra7xx_evm_defconfig +1 -0

index a460897..4dc339c 100644
@@ -17,6 +17,7 @@ CONFIG_USB=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_DWC3_OMAP=y
+CONFIG_USB_DWC3_PHY_OMAP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/dra7xx_evm_qspiboot_defconfig +1 -0

index 56a5965..828a862 100644
@@ -17,6 +17,7 @@ CONFIG_USB=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_DWC3_OMAP=y
+CONFIG_USB_DWC3_PHY_OMAP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/dra7xx_evm_uart3_defconfig +1 -0

index 1121289..c5ff5a9 100644
@@ -18,6 +18,7 @@ CONFIG_USB=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_DWC3_OMAP=y
+CONFIG_USB_DWC3_PHY_OMAP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/odroid-xu3_defconfig +1 -0

index cb6035b..32f6dec 100644
@@ -21,6 +21,7 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
+CONFIG_USB_DWC3_PHY_SAMSUNG=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_VIDEO_BRIDGE=y

configs/omap5_uevm_defconfig +1 -0

index 9a5b91b..7fe4fe5 100644
@@ -11,6 +11,7 @@ CONFIG_USB=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_DWC3_OMAP=y
+CONFIG_USB_DWC3_PHY_OMAP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

drivers/usb/dwc3/Kconfig +17 -0

index 0bb862a..e93398f 100644
@@ -37,4 +37,21 @@ config USB_DWC3_OMAP
 
 	  Say 'Y' here if you have one such device
 
+menu "PHY Subsystem"
+
+config USB_DWC3_PHY_OMAP
+	bool "TI OMAP SoC series USB DRD PHY driver"
+	help
+	  Enable single driver for both USB2 PHY programming and USB3 PHY
+	  programming for TI SoCs.
+
+config USB_DWC3_PHY_SAMSUNG
+	bool "Exynos5 SoC series USB DRD PHY driver"
+	help
+	  Enable USB DRD PHY support for Exynos 5 SoC series.
+	  This driver provides PHY interface for USB 3.0 DRD controller
+	  present on Exynos5 SoC series.
+
+endmenu
+
 endif

include/configs/am43xx_evm.h +1 -2

index b330f1b..7586019 100644
@@ -123,6 +123,7 @@
 
 /* USB GADGET */
 #if defined(CONFIG_SPL_BUILD) && !defined(CONFIG_SPL_USBETH_SUPPORT)
+#undef CONFIG_USB_DWC3_PHY_OMAP
 #undef CONFIG_USB_DWC3_OMAP
 #undef CONFIG_USB_DWC3
 #undef CONFIG_USB_DWC3_GADGET

@@ -134,8 +135,6 @@
 
 #if !defined(CONFIG_SPL_BUILD) || \
 	(defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT))
-#define CONFIG_USB_DWC3_PHY_OMAP
-
 #define CONFIG_G_DNL_MANUFACTURER "Texas Instruments"
 #define CONFIG_G_DNL_VENDOR_NUM 0x0403
 #define CONFIG_G_DNL_PRODUCT_NUM 0xBD00

include/configs/dra7xx_evm.h +0 -2

index 118bf91..8d820f4 100644
@@ -227,8 +227,6 @@
 #define CONFIG_OMAP_USB2PHY2_HOST
 
 /* USB GADGET */
-#define CONFIG_USB_DWC3_PHY_OMAP
-
 #define CONFIG_G_DNL_MANUFACTURER "Texas Instruments"
 #define CONFIG_G_DNL_VENDOR_NUM 0x0451
 #define CONFIG_G_DNL_PRODUCT_NUM 0xd022

include/configs/odroid_xu3.h +0 -3

index 57e20e7..76131cd 100644
@@ -47,9 +47,6 @@
 #define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_EXYNOS
 
-/* DWC3 */
-#define CONFIG_USB_DWC3_PHY_SAMSUNG
-
 /* Downloader */
 #define CONFIG_G_DNL_VENDOR_NUM		0x04E8
 #define CONFIG_G_DNL_PRODUCT_NUM	0x6601

include/configs/omap5_uevm.h +0 -2

index 533ac7b..bf92212 100644
@@ -100,8 +100,6 @@
 #define CONFIG_OMAP_EHCI_PHY3_RESET_GPIO 79
 
 /* USB GADGET */
-#define CONFIG_USB_DWC3_PHY_OMAP
-
 #define CONFIG_G_DNL_MANUFACTURER "Texas Instruments"
 #define CONFIG_G_DNL_VENDOR_NUM 0x0403
 #define CONFIG_G_DNL_PRODUCT_NUM 0xBD00

Signature · 1 line

2.8.0.rc3

Semen Protsenko

author

2016-04-11 15:27 UTC #8 lore raw

PATCH v3 7/7 usb: gadget Move: CONFIG_G_DNL_* to Kconfig

In reply to Semen Protsenko

From: Sam Protsenko <[email protected]>

And also reformat defconfigs using "make savedefconfig" rule.

Signed-off-by Sam Protsenko <[email protected]>

---
 configs/A13-OLinuXino_defconfig           |  3 +++
 configs/CHIP_defconfig                    |  3 +++
 configs/Cubietruck_defconfig              |  3 +++
 configs/am335x_baltos_defconfig           |  3 +++
 configs/am335x_boneblack_defconfig        |  3 +++
 configs/am335x_boneblack_vboot_defconfig  |  3 +++
 configs/am335x_evm_defconfig              |  3 +++
 configs/am335x_evm_nor_defconfig          |  3 +++
 configs/am335x_evm_norboot_defconfig      |  3 +++
 configs/am335x_evm_spiboot_defconfig      |  3 +++
 configs/am335x_evm_usbspl_defconfig       |  3 +++
 configs/am335x_gp_evm_defconfig           |  3 +++
 configs/am437x_gp_evm_defconfig           |  3 +++
 configs/am437x_sk_evm_defconfig           |  3 +++
 configs/am43xx_evm_defconfig              |  3 +++
 configs/am43xx_evm_ethboot_defconfig      |  3 +++
 configs/am43xx_evm_qspiboot_defconfig     |  3 +++
 configs/am43xx_evm_usbhost_boot_defconfig |  3 +++
 configs/apalis_t30_defconfig              |  3 +++
 configs/bcm11130_defconfig                |  3 +++
 configs/bcm11130_nand_defconfig           |  3 +++
 configs/bcm28155_ap_defconfig             |  3 +++
 configs/bcm28155_w1d_defconfig            |  3 +++
 configs/beaver_defconfig                  |  3 +++
 configs/birdland_bav335a_defconfig        |  3 +++
 configs/birdland_bav335b_defconfig        |  3 +++
 configs/cgtqmx6eval_defconfig             |  3 +++
 configs/colibri_t20_defconfig             |  3 +++
 configs/colibri_t30_defconfig             |  3 +++
 configs/colibri_vf_defconfig              |  3 +++
 configs/corvus_defconfig                  |  3 +++
 configs/dalmore_defconfig                 |  3 +++
 configs/dra72_evm_defconfig               |  3 +++
 configs/dra74_evm_defconfig               |  3 +++
 configs/dra7xx_evm_defconfig              |  3 +++
 configs/dra7xx_evm_qspiboot_defconfig     |  3 +++
 configs/dra7xx_evm_uart3_defconfig        |  3 +++
 configs/draco_defconfig                   |  3 +++
 configs/e2220-1170_defconfig              |  3 +++
 configs/gwventana_defconfig               |  3 +++
 configs/jetson-tk1_defconfig              |  3 +++
 configs/kc1_defconfig                     |  3 +++
 configs/mx6dlsabreauto_defconfig          |  3 +++
 configs/mx6dlsabresd_defconfig            |  3 +++
 configs/mx6qpsabreauto_defconfig          |  3 +++
 configs/mx6qsabreauto_defconfig           |  3 +++
 configs/mx6qsabrelite_defconfig           |  3 +++
 configs/mx6qsabresd_defconfig             |  3 +++
 configs/mx6sabresd_spl_defconfig          |  3 +++
 configs/mx7dsabresd_defconfig             |  3 +++
 configs/nitrogen6dl2g_defconfig           |  3 +++
 configs/nitrogen6dl_defconfig             |  3 +++
 configs/nitrogen6q2g_defconfig            |  3 +++
 configs/nitrogen6q_defconfig              |  3 +++
 configs/nitrogen6s1g_defconfig            |  3 +++
 configs/nitrogen6s_defconfig              |  3 +++
 configs/nyan-big_defconfig                |  3 +++
 configs/odroid-xu3_defconfig              |  3 +++
 configs/odroid_defconfig                  |  3 +++
 configs/omap3_beagle_defconfig            |  3 +++
 configs/omap3_logic_defconfig             |  3 +++
 configs/omap5_uevm_defconfig              |  3 +++
 configs/origen_defconfig                  |  3 +++
 configs/p2371-0000_defconfig              |  3 +++
 configs/p2371-2180_defconfig              |  3 +++
 configs/p2571_defconfig                   |  3 +++
 configs/pxm2_defconfig                    |  3 +++
 configs/rastaban_defconfig                |  3 +++
 configs/rut_defconfig                     |  3 +++
 configs/s5p_goni_defconfig                |  3 +++
 configs/s5pc210_universal_defconfig       |  3 +++
 configs/smartweb_defconfig                |  3 +++
 configs/sniper_defconfig                  |  3 +++
 configs/socfpga_arria5_defconfig          |  3 +++
 configs/socfpga_cyclone5_defconfig        |  3 +++
 configs/socfpga_de0_nano_soc_defconfig    |  3 +++
 configs/socfpga_mcvevk_defconfig          |  3 +++
 configs/socfpga_sockit_defconfig          |  3 +++
 configs/socfpga_socrates_defconfig        |  3 +++
 configs/taurus_defconfig                  |  3 +++
 configs/tbs2910_defconfig                 |  3 +++
 configs/thuban_defconfig                  |  3 +++
 configs/trats2_defconfig                  |  3 +++
 configs/trats_defconfig                   |  3 +++
 configs/venice2_defconfig                 |  3 +++
 configs/warp_defconfig                    |  3 +++
 configs/xilinx_zynqmp_ep_defconfig        |  3 +++
 configs/zynq_picozed_defconfig            |  3 +++
 configs/zynq_zc702_defconfig              |  3 +++
 configs/zynq_zc706_defconfig              |  3 +++
 configs/zynq_zed_defconfig                |  3 +++
 configs/zynq_zybo_defconfig               |  3 +++
 drivers/usb/gadget/Kconfig                | 13 +++++++++++++
 drivers/usb/gadget/g_dnl.c                |  2 +-
 include/configs/am335x_evm.h              |  5 -----
 include/configs/am43xx_evm.h              | 11 +++--------
 include/configs/baltos.h                  |  5 -----
 include/configs/bav335x.h                 |  5 -----
 include/configs/bcm28155_ap.h             |  3 ---
 include/configs/cgtqmx6eval.h             |  4 ----
 include/configs/colibri_vf.h              |  3 ---
 include/configs/corvus.h                  |  5 -----
 include/configs/dra7xx_evm.h              |  5 -----
 include/configs/exynos4-common.h          |  5 +----
 include/configs/gw_ventana.h              |  5 -----
 include/configs/kc1.h                     |  8 --------
 include/configs/mx6sabre_common.h         |  4 ----
 include/configs/mx7dsabresd.h             |  4 ----
 include/configs/nitrogen6x.h              |  5 -----
 include/configs/odroid_xu3.h              |  5 -----
 include/configs/omap3_beagle.h            |  3 ---
 include/configs/omap3_logic.h             |  3 ---
 include/configs/omap5_uevm.h              |  5 -----
 include/configs/s5p_goni.h                |  6 ++----
 include/configs/siemens-am33x-common.h    |  3 ---
 include/configs/smartweb.h                |  5 -----
 include/configs/sniper.h                  |  8 --------
 include/configs/socfpga_common.h          |  9 ++-------
 include/configs/sunxi-common.h            |  3 ---
 include/configs/taurus.h                  |  5 -----
 include/configs/tbs2910.h                 |  3 ---
 include/configs/tegra-common-usb-gadget.h |  9 ---------
 include/configs/warp.h                    |  4 ----
 include/configs/xilinx_zynqmp.h           |  3 ---
 include/configs/zynq-common.h             |  3 ---
 125 files changed, 298 insertions(+), 147 deletions(-)

configs/A13-OLinuXino_defconfig +3 -0

index 63cd8ef..023450c 100644
@@ -24,3 +24,6 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Allwinner Technology"
+CONFIG_G_DNL_VENDOR_NUM=0x1f3a
+CONFIG_G_DNL_PRODUCT_NUM=0x1010

configs/CHIP_defconfig +3 -0

index 6aaf626..6f9dac9 100644
@@ -15,3 +15,6 @@ CONFIG_AXP_ALDO4_VOLT=3300
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Allwinner Technology"
+CONFIG_G_DNL_VENDOR_NUM=0x1f3a
+CONFIG_G_DNL_PRODUCT_NUM=0x1010

configs/Cubietruck_defconfig +3 -0

index f482065..e4598f0 100644
@@ -21,3 +21,6 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Allwinner Technology"
+CONFIG_G_DNL_VENDOR_NUM=0x1f3a
+CONFIG_G_DNL_PRODUCT_NUM=0x1010

configs/am335x_baltos_defconfig +3 -0

index c0c7468..e43a121 100644
@@ -16,4 +16,7 @@ CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
+CONFIG_G_DNL_VENDOR_NUM=0x0403
+CONFIG_G_DNL_PRODUCT_NUM=0xbd00
 CONFIG_OF_LIBFDT=y

configs/am335x_boneblack_defconfig +3 -0

index 8f781c8..d8e793f 100644
@@ -21,4 +21,7 @@ CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
+CONFIG_G_DNL_VENDOR_NUM=0x0451
+CONFIG_G_DNL_PRODUCT_NUM=0xd022
 CONFIG_OF_LIBFDT=y

configs/am335x_boneblack_vboot_defconfig +3 -0

index 8e252ff..10d4311 100644
@@ -28,3 +28,6 @@ CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
+CONFIG_G_DNL_VENDOR_NUM=0x0451
+CONFIG_G_DNL_PRODUCT_NUM=0xd022

configs/am335x_evm_defconfig +3 -0

index 426ddc5..5ca0f24 100644
@@ -20,4 +20,7 @@ CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
+CONFIG_G_DNL_VENDOR_NUM=0x0451
+CONFIG_G_DNL_PRODUCT_NUM=0xd022
 CONFIG_OF_LIBFDT=y

configs/am335x_evm_nor_defconfig +3 -0

index 264fe36..bc84100 100644
@@ -16,4 +16,7 @@ CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
+CONFIG_G_DNL_VENDOR_NUM=0x0451
+CONFIG_G_DNL_PRODUCT_NUM=0xd022
 CONFIG_OF_LIBFDT=y

configs/am335x_evm_norboot_defconfig +3 -0

index 222fe82..4a724aa 100644
@@ -13,4 +13,7 @@ CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
+CONFIG_G_DNL_VENDOR_NUM=0x0451
+CONFIG_G_DNL_PRODUCT_NUM=0xd022
 CONFIG_OF_LIBFDT=y

configs/am335x_evm_spiboot_defconfig +3 -0

index 917128b..5428941 100644
@@ -16,4 +16,7 @@ CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
+CONFIG_G_DNL_VENDOR_NUM=0x0451
+CONFIG_G_DNL_PRODUCT_NUM=0xd022
 CONFIG_OF_LIBFDT=y

configs/am335x_evm_usbspl_defconfig +3 -0

index 81b3d27..7f7a55d 100644
@@ -16,4 +16,7 @@ CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
+CONFIG_G_DNL_VENDOR_NUM=0x0451
+CONFIG_G_DNL_PRODUCT_NUM=0xd022
 CONFIG_OF_LIBFDT=y

configs/am335x_gp_evm_defconfig +3 -0

index a06f722..1ee07c9 100644
@@ -22,4 +22,7 @@ CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
+CONFIG_G_DNL_VENDOR_NUM=0x0451
+CONFIG_G_DNL_PRODUCT_NUM=0xd022
 CONFIG_RSA=y

configs/am437x_gp_evm_defconfig +3 -0

index c1b26e0..69f5ac7 100644
@@ -27,3 +27,6 @@ CONFIG_USB_DWC3_OMAP=y
 CONFIG_USB_DWC3_PHY_OMAP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
+CONFIG_G_DNL_VENDOR_NUM=0x0403
+CONFIG_G_DNL_PRODUCT_NUM=0xbd00

configs/am437x_sk_evm_defconfig +3 -0

index 80ff4da..c7a9fbe 100644
@@ -31,3 +31,6 @@ CONFIG_USB_DWC3_OMAP=y
 CONFIG_USB_DWC3_PHY_OMAP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
+CONFIG_G_DNL_VENDOR_NUM=0x0403
+CONFIG_G_DNL_PRODUCT_NUM=0xbd00

configs/am43xx_evm_defconfig +3 -0

index 97ea209..d6a1c3c 100644
@@ -18,4 +18,7 @@ CONFIG_USB_DWC3_OMAP=y
 CONFIG_USB_DWC3_PHY_OMAP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
+CONFIG_G_DNL_VENDOR_NUM=0x0403
+CONFIG_G_DNL_PRODUCT_NUM=0xbd00
 CONFIG_OF_LIBFDT=y

configs/am43xx_evm_ethboot_defconfig +3 -0

index 5963437..67a9d49 100644
@@ -17,4 +17,7 @@ CONFIG_USB_DWC3_OMAP=y
 CONFIG_USB_DWC3_PHY_OMAP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
+CONFIG_G_DNL_VENDOR_NUM=0x0403
+CONFIG_G_DNL_PRODUCT_NUM=0xbd00
 CONFIG_OF_LIBFDT=y

configs/am43xx_evm_qspiboot_defconfig +3 -0

index 02ce1ef..2194b16 100644
@@ -16,4 +16,7 @@ CONFIG_USB_DWC3_OMAP=y
 CONFIG_USB_DWC3_PHY_OMAP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
+CONFIG_G_DNL_VENDOR_NUM=0x0403
+CONFIG_G_DNL_PRODUCT_NUM=0xbd00
 CONFIG_OF_LIBFDT=y

configs/am43xx_evm_usbhost_boot_defconfig +3 -0

index 9ac5c99..6840453 100644
@@ -17,4 +17,7 @@ CONFIG_USB_DWC3_OMAP=y
 CONFIG_USB_DWC3_PHY_OMAP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
+CONFIG_G_DNL_VENDOR_NUM=0x0403
+CONFIG_G_DNL_PRODUCT_NUM=0xbd00
 CONFIG_OF_LIBFDT=y

configs/apalis_t30_defconfig +3 -0

index 882a21e..0686129 100644
@@ -20,4 +20,7 @@ CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="NVIDIA"
+CONFIG_G_DNL_VENDOR_NUM=0x0955
+CONFIG_G_DNL_PRODUCT_NUM=0x701a
 CONFIG_USE_PRIVATE_LIBGCC=y

configs/bcm11130_defconfig +3 -0

index 74a2881..a1fc989 100644
@@ -12,3 +12,6 @@ CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DWC2_OTG=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Broadcom Corporation"
+CONFIG_G_DNL_VENDOR_NUM=0x18d1
+CONFIG_G_DNL_PRODUCT_NUM=0x0d02

configs/bcm11130_nand_defconfig +3 -0

index 9c66669..a49b3dc 100644
@@ -12,3 +12,6 @@ CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DWC2_OTG=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Broadcom Corporation"
+CONFIG_G_DNL_VENDOR_NUM=0x18d1
+CONFIG_G_DNL_PRODUCT_NUM=0x0d02

configs/bcm28155_ap_defconfig +3 -0

index 50a6a30..8076c4f 100644
@@ -11,3 +11,6 @@ CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DWC2_OTG=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Broadcom Corporation"
+CONFIG_G_DNL_VENDOR_NUM=0x18d1
+CONFIG_G_DNL_PRODUCT_NUM=0x0d02

configs/bcm28155_w1d_defconfig +3 -0

index cd6a190..25c8ff6 100644
@@ -12,3 +12,6 @@ CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DWC2_OTG=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Broadcom Corporation"
+CONFIG_G_DNL_VENDOR_NUM=0x18d1
+CONFIG_G_DNL_PRODUCT_NUM=0x0d02

configs/beaver_defconfig +3 -0

index 04ecab9..a67d803 100644
@@ -24,4 +24,7 @@ CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="NVIDIA"
+CONFIG_G_DNL_VENDOR_NUM=0x0955
+CONFIG_G_DNL_PRODUCT_NUM=0x701a
 CONFIG_USE_PRIVATE_LIBGCC=y

configs/birdland_bav335a_defconfig +3 -0

index d9a58ad..5828e2b 100644
@@ -15,4 +15,7 @@ CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
+CONFIG_G_DNL_VENDOR_NUM=0x0451
+CONFIG_G_DNL_PRODUCT_NUM=0xd022
 CONFIG_OF_LIBFDT=y

configs/birdland_bav335b_defconfig +3 -0

index e605ac6..bbefb55 100644
@@ -15,4 +15,7 @@ CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
+CONFIG_G_DNL_VENDOR_NUM=0x0451
+CONFIG_G_DNL_PRODUCT_NUM=0xd022
 CONFIG_OF_LIBFDT=y

configs/cgtqmx6eval_defconfig +3 -0

index d21e3e9..ad6f093 100644
@@ -12,4 +12,7 @@ CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Congatec"
+CONFIG_G_DNL_VENDOR_NUM=0x0525
+CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
 CONFIG_OF_LIBFDT=y

configs/colibri_t20_defconfig +3 -0

index 30d8b2b..57e0eb5 100644
@@ -23,6 +23,9 @@ CONFIG_USB_ULPI=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="NVIDIA"
+CONFIG_G_DNL_VENDOR_NUM=0x0955
+CONFIG_G_DNL_PRODUCT_NUM=0x701a
 CONFIG_DM_VIDEO=y
 CONFIG_VIDEO_TEGRA20=y
 CONFIG_USE_PRIVATE_LIBGCC=y

configs/colibri_t30_defconfig +3 -0

index 81258a7..583de25 100644
@@ -18,4 +18,7 @@ CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="NVIDIA"
+CONFIG_G_DNL_VENDOR_NUM=0x0955
+CONFIG_G_DNL_PRODUCT_NUM=0x701a
 CONFIG_USE_PRIVATE_LIBGCC=y

configs/colibri_vf_defconfig +3 -0

index ba6ee38..5481f04 100644
@@ -21,3 +21,6 @@ CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Toradex"
+CONFIG_G_DNL_VENDOR_NUM=0x1b67
+CONFIG_G_DNL_PRODUCT_NUM=0x0016

configs/corvus_defconfig +3 -0

index 534a31b..bae8a05 100644
@@ -14,4 +14,7 @@ CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_ATMEL_USBA=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Siemens AG"
+CONFIG_G_DNL_VENDOR_NUM=0x0908
+CONFIG_G_DNL_PRODUCT_NUM=0x02d2
 CONFIG_OF_LIBFDT=y

configs/dalmore_defconfig +3 -0

index ccfc6ba..a1e2a73 100644
@@ -22,4 +22,7 @@ CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="NVIDIA"
+CONFIG_G_DNL_VENDOR_NUM=0x0955
+CONFIG_G_DNL_PRODUCT_NUM=0x701a
 CONFIG_USE_PRIVATE_LIBGCC=y

configs/dra72_evm_defconfig +3 -0

index 1b8d2b9..0d63986 100644
@@ -30,3 +30,6 @@ CONFIG_USB_DWC3_OMAP=y
 CONFIG_USB_DWC3_PHY_OMAP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
+CONFIG_G_DNL_VENDOR_NUM=0x0451
+CONFIG_G_DNL_PRODUCT_NUM=0xd022

configs/dra74_evm_defconfig +3 -0

index 2abf81e..8ce544e 100644
@@ -29,3 +29,6 @@ CONFIG_USB_DWC3_OMAP=y
 CONFIG_USB_DWC3_PHY_OMAP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
+CONFIG_G_DNL_VENDOR_NUM=0x0451
+CONFIG_G_DNL_PRODUCT_NUM=0xd022

configs/dra7xx_evm_defconfig +3 -0

index 4dc339c..1b1c0be 100644
@@ -20,4 +20,7 @@ CONFIG_USB_DWC3_OMAP=y
 CONFIG_USB_DWC3_PHY_OMAP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
+CONFIG_G_DNL_VENDOR_NUM=0x0451
+CONFIG_G_DNL_PRODUCT_NUM=0xd022
 CONFIG_OF_LIBFDT=y

configs/dra7xx_evm_qspiboot_defconfig +3 -0

index 828a862..0130188 100644
@@ -20,4 +20,7 @@ CONFIG_USB_DWC3_OMAP=y
 CONFIG_USB_DWC3_PHY_OMAP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
+CONFIG_G_DNL_VENDOR_NUM=0x0451
+CONFIG_G_DNL_PRODUCT_NUM=0xd022
 CONFIG_OF_LIBFDT=y

configs/dra7xx_evm_uart3_defconfig +3 -0

index c5ff5a9..ca80077 100644
@@ -21,4 +21,7 @@ CONFIG_USB_DWC3_OMAP=y
 CONFIG_USB_DWC3_PHY_OMAP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
+CONFIG_G_DNL_VENDOR_NUM=0x0451
+CONFIG_G_DNL_PRODUCT_NUM=0xd022
 CONFIG_OF_LIBFDT=y

configs/draco_defconfig +3 -0

index 48ae025..7c3f828 100644
@@ -16,4 +16,7 @@ CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Siemens AG"
+CONFIG_G_DNL_VENDOR_NUM=0x0908
+CONFIG_G_DNL_PRODUCT_NUM=0x02d2
 CONFIG_OF_LIBFDT=y

configs/e2220-1170_defconfig +3 -0

index 845e6d3..38c085a 100644
@@ -20,3 +20,6 @@ CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="NVIDIA"
+CONFIG_G_DNL_VENDOR_NUM=0x0955
+CONFIG_G_DNL_PRODUCT_NUM=0x701a

configs/gwventana_defconfig +3 -0

index 0afc696..49ee273 100644
@@ -20,4 +20,7 @@ CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Gateworks"
+CONFIG_G_DNL_VENDOR_NUM=0x0525
+CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
 CONFIG_OF_LIBFDT=y

configs/jetson-tk1_defconfig +3 -0

index eefe971..bf509c2 100644
@@ -24,4 +24,7 @@ CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="NVIDIA"
+CONFIG_G_DNL_VENDOR_NUM=0x0955
+CONFIG_G_DNL_PRODUCT_NUM=0x701a
 CONFIG_USE_PRIVATE_LIBGCC=y

configs/kc1_defconfig +3 -0

index 351da87..a9643cf 100644
@@ -14,4 +14,7 @@ CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
+CONFIG_G_DNL_VENDOR_NUM=0x0451
+CONFIG_G_DNL_PRODUCT_NUM=0xd022
 CONFIG_OF_LIBFDT=y

configs/mx6dlsabreauto_defconfig +3 -0

index 350ca68..561e886 100644
@@ -11,4 +11,7 @@ CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="FSL"
+CONFIG_G_DNL_VENDOR_NUM=0x0525
+CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
 CONFIG_OF_LIBFDT=y

configs/mx6dlsabresd_defconfig +3 -0

index 4f46753..870e403 100644
@@ -11,4 +11,7 @@ CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="FSL"
+CONFIG_G_DNL_VENDOR_NUM=0x0525
+CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
 CONFIG_OF_LIBFDT=y

configs/mx6qpsabreauto_defconfig +3 -0

index 47843f1..61f0a75 100644
@@ -9,4 +9,7 @@ CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="FSL"
+CONFIG_G_DNL_VENDOR_NUM=0x0525
+CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
 CONFIG_OF_LIBFDT=y

configs/mx6qsabreauto_defconfig +3 -0

index f719673..49aa619 100644
@@ -11,4 +11,7 @@ CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="FSL"
+CONFIG_G_DNL_VENDOR_NUM=0x0525
+CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
 CONFIG_OF_LIBFDT=y

configs/mx6qsabrelite_defconfig +3 -0

index d6f76cc..84faa2f 100644
@@ -13,4 +13,7 @@ CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Boundary"
+CONFIG_G_DNL_VENDOR_NUM=0x0525
+CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
 CONFIG_OF_LIBFDT=y

configs/mx6qsabresd_defconfig +3 -0

index 6d6afd8..7b69de1 100644
@@ -11,4 +11,7 @@ CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="FSL"
+CONFIG_G_DNL_VENDOR_NUM=0x0525
+CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
 CONFIG_OF_LIBFDT=y

configs/mx6sabresd_spl_defconfig +3 -0

index 078a362..540a822 100644
@@ -12,4 +12,7 @@ CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="FSL"
+CONFIG_G_DNL_VENDOR_NUM=0x0525
+CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
 CONFIG_OF_LIBFDT=y

configs/mx7dsabresd_defconfig +3 -0

index 375c4c7..f037a35 100644
@@ -16,4 +16,7 @@ CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="FSL"
+CONFIG_G_DNL_VENDOR_NUM=0x0525
+CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
 CONFIG_OF_LIBFDT=y

configs/nitrogen6dl2g_defconfig +3 -0

index 338911a..34ddff9 100644
@@ -11,4 +11,7 @@ CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Boundary"
+CONFIG_G_DNL_VENDOR_NUM=0x0525
+CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
 CONFIG_OF_LIBFDT=y

configs/nitrogen6dl_defconfig +3 -0

index 0c38e92..c2bea2e 100644
@@ -11,4 +11,7 @@ CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Boundary"
+CONFIG_G_DNL_VENDOR_NUM=0x0525
+CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
 CONFIG_OF_LIBFDT=y

configs/nitrogen6q2g_defconfig +3 -0

index 710fdef..0ce35b0 100644
@@ -11,4 +11,7 @@ CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Boundary"
+CONFIG_G_DNL_VENDOR_NUM=0x0525
+CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
 CONFIG_OF_LIBFDT=y

configs/nitrogen6q_defconfig +3 -0

index 0563ff3..ef2f0e2 100644
@@ -11,4 +11,7 @@ CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Boundary"
+CONFIG_G_DNL_VENDOR_NUM=0x0525
+CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
 CONFIG_OF_LIBFDT=y

configs/nitrogen6s1g_defconfig +3 -0

index 56c4b15..0aac630 100644
@@ -11,4 +11,7 @@ CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Boundary"
+CONFIG_G_DNL_VENDOR_NUM=0x0525
+CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
 CONFIG_OF_LIBFDT=y

configs/nitrogen6s_defconfig +3 -0

index 0229eaa..d6280df 100644
@@ -11,4 +11,7 @@ CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Boundary"
+CONFIG_G_DNL_VENDOR_NUM=0x0525
+CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
 CONFIG_OF_LIBFDT=y

configs/nyan-big_defconfig +3 -0

index 8ce1c2f..d86a55c 100644
@@ -37,6 +37,9 @@ CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="NVIDIA"
+CONFIG_G_DNL_VENDOR_NUM=0x0955
+CONFIG_G_DNL_PRODUCT_NUM=0x701a
 CONFIG_DM_VIDEO=y
 CONFIG_DISPLAY=y
 CONFIG_VIDEO_TEGRA124=y

configs/odroid-xu3_defconfig +3 -0

index 32f6dec..bb0576a 100644
@@ -24,5 +24,8 @@ CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_DWC3_PHY_SAMSUNG=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Samsung"
+CONFIG_G_DNL_VENDOR_NUM=0x04e8
+CONFIG_G_DNL_PRODUCT_NUM=0x6601
 CONFIG_VIDEO_BRIDGE=y
 CONFIG_ERRNO_STR=y

configs/odroid_defconfig +3 -0

index 2aea8c6..a92bbe1 100644
@@ -26,4 +26,7 @@ CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DWC2_OTG=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Samsung"
+CONFIG_G_DNL_VENDOR_NUM=0x04e8
+CONFIG_G_DNL_PRODUCT_NUM=0x6601
 CONFIG_ERRNO_STR=y

configs/omap3_beagle_defconfig +3 -0

index fdce13c..ab54570 100644
@@ -11,4 +11,7 @@ CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="TI"
+CONFIG_G_DNL_VENDOR_NUM=0x0451
+CONFIG_G_DNL_PRODUCT_NUM=0xd022
 CONFIG_OF_LIBFDT=y

configs/omap3_logic_defconfig +3 -0

index ccb9686..dfbd180 100644
@@ -15,4 +15,7 @@ CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="TI"
+CONFIG_G_DNL_VENDOR_NUM=0x0451
+CONFIG_G_DNL_PRODUCT_NUM=0xd022
 CONFIG_OF_LIBFDT=y

configs/omap5_uevm_defconfig +3 -0

index 7fe4fe5..135c89d 100644
@@ -14,4 +14,7 @@ CONFIG_USB_DWC3_OMAP=y
 CONFIG_USB_DWC3_PHY_OMAP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
+CONFIG_G_DNL_VENDOR_NUM=0x0403
+CONFIG_G_DNL_PRODUCT_NUM=0xbd00
 CONFIG_OF_LIBFDT=y

configs/origen_defconfig +3 -0

index 17141fd..de4a816 100644
@@ -16,3 +16,6 @@ CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DWC2_OTG=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Samsung"
+CONFIG_G_DNL_VENDOR_NUM=0x04e8
+CONFIG_G_DNL_PRODUCT_NUM=0x6601

configs/p2371-0000_defconfig +3 -0

index d258c7c..c9f7be2 100644
@@ -21,3 +21,6 @@ CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="NVIDIA"
+CONFIG_G_DNL_VENDOR_NUM=0x0955
+CONFIG_G_DNL_PRODUCT_NUM=0x701a

configs/p2371-2180_defconfig +3 -0

index 26765d6..086a294 100644
@@ -23,3 +23,6 @@ CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="NVIDIA"
+CONFIG_G_DNL_VENDOR_NUM=0x0955
+CONFIG_G_DNL_PRODUCT_NUM=0x701a

configs/p2571_defconfig +3 -0

index 68abec1..f7596a5 100644
@@ -21,3 +21,6 @@ CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="NVIDIA"
+CONFIG_G_DNL_VENDOR_NUM=0x0955
+CONFIG_G_DNL_PRODUCT_NUM=0x701a

configs/pxm2_defconfig +3 -0

index f274784..7a53016 100644
@@ -17,4 +17,7 @@ CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Siemens AG"
+CONFIG_G_DNL_VENDOR_NUM=0x0908
+CONFIG_G_DNL_PRODUCT_NUM=0x02d2
 CONFIG_OF_LIBFDT=y

configs/rastaban_defconfig +3 -0

index 508ee47..e3bb5ae 100644
@@ -16,4 +16,7 @@ CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Siemens AG"
+CONFIG_G_DNL_VENDOR_NUM=0x0908
+CONFIG_G_DNL_PRODUCT_NUM=0x02d2
 CONFIG_OF_LIBFDT=y

configs/rut_defconfig +3 -0

index 0363980..035fd1e 100644
@@ -17,4 +17,7 @@ CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Siemens AG"
+CONFIG_G_DNL_VENDOR_NUM=0x0908
+CONFIG_G_DNL_PRODUCT_NUM=0x02d2
 CONFIG_OF_LIBFDT=y

configs/s5p_goni_defconfig +3 -0

index 47cf3af..8c1438d 100644
@@ -15,3 +15,6 @@ CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DWC2_OTG=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Samsung"
+CONFIG_G_DNL_VENDOR_NUM=0x04e8
+CONFIG_G_DNL_PRODUCT_NUM=0x6601

configs/s5pc210_universal_defconfig +3 -0

index 9927012..d91b433 100644
@@ -15,3 +15,6 @@ CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DWC2_OTG=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Samsung"
+CONFIG_G_DNL_VENDOR_NUM=0x04e8
+CONFIG_G_DNL_PRODUCT_NUM=0x6601

configs/smartweb_defconfig +3 -0

index 6d25479..ce514c2 100644
@@ -11,4 +11,7 @@ CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b"
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Siemens AG"
+CONFIG_G_DNL_VENDOR_NUM=0x0908
+CONFIG_G_DNL_PRODUCT_NUM=0x02d2
 CONFIG_OF_LIBFDT=y

configs/sniper_defconfig +3 -0

index 6816d5a..6a31771 100644
@@ -14,4 +14,7 @@ CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
+CONFIG_G_DNL_VENDOR_NUM=0x0451
+CONFIG_G_DNL_PRODUCT_NUM=0xd022
 CONFIG_OF_LIBFDT=y

configs/socfpga_arria5_defconfig +3 -0

index fbf7266..9c8671c 100644
@@ -30,3 +30,6 @@ CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DWC2_OTG=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="altera"
+CONFIG_G_DNL_VENDOR_NUM=0x0525
+CONFIG_G_DNL_PRODUCT_NUM=0xa4a5

configs/socfpga_cyclone5_defconfig +3 -0

index da323db..b68b298 100644
@@ -30,3 +30,6 @@ CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DWC2_OTG=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="altera"
+CONFIG_G_DNL_VENDOR_NUM=0x0525
+CONFIG_G_DNL_PRODUCT_NUM=0xa4a5

configs/socfpga_de0_nano_soc_defconfig +3 -0

index c5efba5..d813dc9 100644
@@ -25,3 +25,6 @@ CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DWC2_OTG=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="terasic"
+CONFIG_G_DNL_VENDOR_NUM=0x0525
+CONFIG_G_DNL_PRODUCT_NUM=0xa4a5

configs/socfpga_mcvevk_defconfig +3 -0

index f1ae006..5fe6238 100644
@@ -25,3 +25,6 @@ CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DWC2_OTG=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="denx"
+CONFIG_G_DNL_VENDOR_NUM=0x0525
+CONFIG_G_DNL_PRODUCT_NUM=0xa4a5

configs/socfpga_sockit_defconfig +3 -0

index 730d9fc..8894e09 100644
@@ -30,3 +30,6 @@ CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DWC2_OTG=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="terasic"
+CONFIG_G_DNL_VENDOR_NUM=0x0525
+CONFIG_G_DNL_PRODUCT_NUM=0xa4a5

configs/socfpga_socrates_defconfig +3 -0

index 1cf2ce0..562052c 100644
@@ -29,3 +29,6 @@ CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DWC2_OTG=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="ebv"
+CONFIG_G_DNL_VENDOR_NUM=0x0525
+CONFIG_G_DNL_PRODUCT_NUM=0xa4a5

configs/taurus_defconfig +3 -0

index 8cdbb89..b5ab8b4 100644
@@ -16,5 +16,8 @@ CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Siemens AG"
+CONFIG_G_DNL_VENDOR_NUM=0x0908
+CONFIG_G_DNL_PRODUCT_NUM=0x02d2
 CONFIG_USE_TINY_PRINTF=y
 CONFIG_OF_LIBFDT=y

configs/tbs2910_defconfig +3 -0

index 5dca48f..9f6aa8d 100644
@@ -12,4 +12,7 @@ CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="TBS"
+CONFIG_G_DNL_VENDOR_NUM=0x0525
+CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
 CONFIG_OF_LIBFDT=y

configs/thuban_defconfig +3 -0

index 0fd57e6..047dc69 100644
@@ -16,4 +16,7 @@ CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Siemens AG"
+CONFIG_G_DNL_VENDOR_NUM=0x0908
+CONFIG_G_DNL_PRODUCT_NUM=0x02d2
 CONFIG_OF_LIBFDT=y

configs/trats2_defconfig +3 -0

index d7f8405..14bdc6a 100644
@@ -18,3 +18,6 @@ CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DWC2_OTG=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Samsung"
+CONFIG_G_DNL_VENDOR_NUM=0x04e8
+CONFIG_G_DNL_PRODUCT_NUM=0x6601

configs/trats_defconfig +3 -0

index b5431e5..c3b82bb 100644
@@ -17,3 +17,6 @@ CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DWC2_OTG=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Samsung"
+CONFIG_G_DNL_VENDOR_NUM=0x04e8
+CONFIG_G_DNL_PRODUCT_NUM=0x6601

configs/venice2_defconfig +3 -0

index 0d20697..75e7579 100644
@@ -22,4 +22,7 @@ CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="NVIDIA"
+CONFIG_G_DNL_VENDOR_NUM=0x0955
+CONFIG_G_DNL_PRODUCT_NUM=0x701a
 CONFIG_USE_PRIVATE_LIBGCC=y

configs/warp_defconfig +3 -0

index c51516c..b9e4648 100644
@@ -12,4 +12,7 @@ CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="FSL"
+CONFIG_G_DNL_VENDOR_NUM=0x0525
+CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
 CONFIG_OF_LIBFDT=y

configs/xilinx_zynqmp_ep_defconfig +3 -0

index 34cff0c..ae8cc06 100644
@@ -34,4 +34,7 @@ CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Xilinx"
+CONFIG_G_DNL_VENDOR_NUM=0x03fd
+CONFIG_G_DNL_PRODUCT_NUM=0x0300
 # CONFIG_REGEX is not set

configs/zynq_picozed_defconfig +3 -0

index 3bd6fca..ffbc73d 100644
@@ -18,3 +18,6 @@ CONFIG_USB_ULPI=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Xilinx"
+CONFIG_G_DNL_VENDOR_NUM=0x03fd
+CONFIG_G_DNL_PRODUCT_NUM=0x0300

configs/zynq_zc702_defconfig +3 -0

index 81d211f..5d9136c 100644
@@ -30,3 +30,6 @@ CONFIG_USB_ULPI=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Xilinx"
+CONFIG_G_DNL_VENDOR_NUM=0x03fd
+CONFIG_G_DNL_PRODUCT_NUM=0x0300

configs/zynq_zc706_defconfig +3 -0

index 75d5101..d7c1b96 100644
@@ -27,3 +27,6 @@ CONFIG_USB_ULPI=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Xilinx"
+CONFIG_G_DNL_VENDOR_NUM=0x03fd
+CONFIG_G_DNL_PRODUCT_NUM=0x0300

configs/zynq_zed_defconfig +3 -0

index 51b2788..bc3af09 100644
@@ -27,3 +27,6 @@ CONFIG_USB_ULPI=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Xilinx"
+CONFIG_G_DNL_VENDOR_NUM=0x03fd
+CONFIG_G_DNL_PRODUCT_NUM=0x0300

configs/zynq_zybo_defconfig +3 -0

index 01ca5d2..1895f95 100644
@@ -29,3 +29,6 @@ CONFIG_USB_ULPI=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="Xilinx"
+CONFIG_G_DNL_VENDOR_NUM=0x03fd
+CONFIG_G_DNL_PRODUCT_NUM=0x0300

drivers/usb/gadget/Kconfig +13 -0

index 969873c..a35a1c7 100644
@@ -86,4 +86,17 @@ config USB_GADGET_DOWNLOAD
 	  Composite USB download gadget support (g_dnl) for download functions.
 	  This code works on top of composite gadget.
 
+if USB_GADGET_DOWNLOAD
+
+config G_DNL_MANUFACTURER
+	string "Vendor name of USB device"
+
+config G_DNL_VENDOR_NUM
+	hex "Vendor ID of USB device"
+
+config G_DNL_PRODUCT_NUM
+	hex "Product ID of USB device"
+
+endif # USB_GADGET_DOWNLOAD
+
 endif # USB_GADGET

drivers/usb/gadget/g_dnl.c +1 -1

index 2fa6da4..eb12451 100644
@@ -27,7 +27,7 @@
  * CONFIG_G_DNL_VENDOR_NUM
  * CONFIG_G_DNL_PRODUCT_NUM
  * CONFIG_G_DNL_MANUFACTURER
- * at e.g. ./include/configs/<board>.h
+ * at e.g. ./configs/<board>_defconfig
  */
 
 #define STRING_MANUFACTURER 25

include/configs/am335x_evm.h +0 -5

index cd78a06..1b1684d 100644
@@ -318,11 +318,6 @@
 #define CONFIG_USB_ETH_RNDIS
 #define CONFIG_USBNET_HOST_ADDR	"de:ad:be:af:00:00"
 #endif /* CONFIG_DM_ETH */
-
-/* USB TI's IDs */
-#define CONFIG_G_DNL_VENDOR_NUM 0x0451
-#define CONFIG_G_DNL_PRODUCT_NUM 0xD022
-#define CONFIG_G_DNL_MANUFACTURER "Texas Instruments"
 #endif /* CONFIG_USB_MUSB_GADGET */
 
 /*

include/configs/am43xx_evm.h +3 -8

index 7586019..5d5ae5e 100644
@@ -121,7 +121,6 @@
 #define CONFIG_AM437X_USB2PHY2_HOST
 #endif
 
-/* USB GADGET */
 #if defined(CONFIG_SPL_BUILD) && !defined(CONFIG_SPL_USBETH_SUPPORT)
 #undef CONFIG_USB_DWC3_PHY_OMAP
 #undef CONFIG_USB_DWC3_OMAP

@@ -130,16 +129,12 @@
 
 #undef CONFIG_USB_GADGET_DOWNLOAD
 #undef CONFIG_USB_GADGET_VBUS_DRAW
+#undef CONFIG_G_DNL_MANUFACTURER
+#undef CONFIG_G_DNL_VENDOR_NUM
+#undef CONFIG_G_DNL_PRODUCT_NUM
 #undef CONFIG_USB_GADGET_DUALSPEED
 #endif
 
-#if !defined(CONFIG_SPL_BUILD) || \
-	(defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT))
-#define CONFIG_G_DNL_MANUFACTURER "Texas Instruments"
-#define CONFIG_G_DNL_VENDOR_NUM 0x0403
-#define CONFIG_G_DNL_PRODUCT_NUM 0xBD00
-#endif
-
 /*
  * Disable MMC DM for SPL build and can be re-enabled after adding
  * DM support in SPL

include/configs/baltos.h +0 -5

index 96a17dd..48d0613 100644
@@ -288,11 +288,6 @@
 #define CONFIG_USB_ETHER
 #define CONFIG_USB_ETH_RNDIS
 #define CONFIG_USBNET_HOST_ADDR	"de:ad:be:af:00:00"
-
-/* USB TI's IDs */
-#define CONFIG_G_DNL_VENDOR_NUM 0x0403
-#define CONFIG_G_DNL_PRODUCT_NUM 0xBD00
-#define CONFIG_G_DNL_MANUFACTURER "Texas Instruments"
 #endif /* CONFIG_USB_MUSB_GADGET */
 
 #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT)

include/configs/bav335x.h +0 -5

index b466d48..2c0ec9d 100644
@@ -465,11 +465,6 @@ DEFAULT_LINUX_BOOT_ENV \
 #ifdef CONFIG_USB_MUSB_GADGET
 #define CONFIG_CMD_USB_MASS_STORAGE
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
-
-/* USB TI's IDs */
-#define CONFIG_G_DNL_VENDOR_NUM 0x0451
-#define CONFIG_G_DNL_PRODUCT_NUM 0xD022
-#define CONFIG_G_DNL_MANUFACTURER "Texas Instruments"
 #endif /* CONFIG_USB_MUSB_GADGET */
 
 #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT)

include/configs/bcm28155_ap.h +0 -3

index 680ef16..bd83aab 100644
@@ -140,8 +140,5 @@
 #define CONFIG_FASTBOOT_BUF_ADDR	CONFIG_SYS_SDRAM_BASE
 #define CONFIG_USB_GADGET_BCM_UDC_OTG_PHY
 #define CONFIG_USBID_ADDR		0x34052c46
-#define CONFIG_G_DNL_VENDOR_NUM		0x18d1	/* google */
-#define CONFIG_G_DNL_PRODUCT_NUM	0x0d02	/* nexus one */
-#define CONFIG_G_DNL_MANUFACTURER	"Broadcom Corporation"
 
 #endif /* __BCM28155_AP_H */

include/configs/cgtqmx6eval.h +0 -4

index 403de84..1ac9dca 100644
@@ -91,10 +91,6 @@
 #define CONFIG_CMD_USB_MASS_STORAGE
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
 
-#define CONFIG_G_DNL_VENDOR_NUM		0x0525
-#define CONFIG_G_DNL_PRODUCT_NUM	0xa4a5
-#define CONFIG_G_DNL_MANUFACTURER	"Congatec"
-
 /* USB Device Firmware Update support */
 #define CONFIG_CMD_DFU
 #define CONFIG_USB_FUNCTION_DFU

include/configs/colibri_vf.h +0 -3

index 74a3874..227519f 100644
@@ -238,9 +238,6 @@
 #define CONFIG_TRDX_PID_COLIBRI_VF61     0x0017
 #define CONFIG_TRDX_PID_COLIBRI_VF61IT   0x0018
 #define CONFIG_TRDX_PID_COLIBRI_VF50IT   0x0019
-#define CONFIG_G_DNL_MANUFACTURER        "Toradex"
-#define CONFIG_G_DNL_VENDOR_NUM          CONFIG_TRDX_VID
-#define CONFIG_G_DNL_PRODUCT_NUM         CONFIG_TRDX_PID_COLIBRI_VF50
 
 /* USB DFU */
 #define CONFIG_CMD_DFU

include/configs/corvus.h +0 -5

index 0b28529..a525555 100644
@@ -124,11 +124,6 @@
 #define CONFIG_SYS_DFU_DATA_BUF_SIZE	(SZ_1M)
 #define DFU_MANIFEST_POLL_TIMEOUT	25000
 
-/* USB DFU IDs */
-#define CONFIG_G_DNL_VENDOR_NUM 0x0908
-#define CONFIG_G_DNL_PRODUCT_NUM 0x02d2
-#define CONFIG_G_DNL_MANUFACTURER "Siemens AG"
-
 #define CONFIG_SYS_CACHELINE_SIZE	SZ_8K
 #define CONFIG_SYS_LOAD_ADDR	ATMEL_BASE_CS6

include/configs/dra7xx_evm.h +0 -5

index 8d820f4..d2d16a6 100644
@@ -226,11 +226,6 @@
 #define CONFIG_OMAP_USB_PHY
 #define CONFIG_OMAP_USB2PHY2_HOST
 
-/* USB GADGET */
-#define CONFIG_G_DNL_MANUFACTURER "Texas Instruments"
-#define CONFIG_G_DNL_VENDOR_NUM 0x0451
-#define CONFIG_G_DNL_PRODUCT_NUM 0xd022
-
 /* USB Device Firmware Update support */
 #define CONFIG_USB_FUNCTION_DFU
 #define CONFIG_DFU_RAM

include/configs/exynos4-common.h +1 -4

index a0f4aa8..8522a79 100644
@@ -37,13 +37,10 @@
 #define DFU_DEFAULT_POLL_TIMEOUT 300
 
 /* USB Samsung's IDs */
-#define CONFIG_G_DNL_VENDOR_NUM 0x04E8
-#define CONFIG_G_DNL_PRODUCT_NUM 0x6601
-#define CONFIG_G_DNL_THOR_VENDOR_NUM CONFIG_G_DNL_VENDOR_NUM
+#define CONFIG_G_DNL_THOR_VENDOR_NUM 0x04E8
 #define CONFIG_G_DNL_THOR_PRODUCT_NUM 0x685D
 #define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525
 #define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5
-#define CONFIG_G_DNL_MANUFACTURER "Samsung"
 
 #define CONFIG_SYS_MONITOR_LEN		(256 << 10)	/* Reserve 2 sectors */

include/configs/gw_ventana.h +0 -5

index 0921093..747eafc 100644
@@ -194,11 +194,6 @@
 #define CONFIG_CMD_USB_MASS_STORAGE
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
 
-/* Netchip IDs */
-#define CONFIG_G_DNL_VENDOR_NUM 0x0525
-#define CONFIG_G_DNL_PRODUCT_NUM 0xa4a5
-#define CONFIG_G_DNL_MANUFACTURER "Gateworks"
-
 /* Framebuffer and LCD */
 #define CONFIG_VIDEO
 #define CONFIG_VIDEO_IPUV3

include/configs/kc1.h +0 -8

index ab4cbab..6cbafdd 100644
@@ -185,14 +185,6 @@
 #define CONFIG_USB_MUSB_OMAP2PLUS
 
 /*
- * Download
- */
-
-#define CONFIG_G_DNL_VENDOR_NUM		0x0451
-#define CONFIG_G_DNL_PRODUCT_NUM	0xd022
-#define CONFIG_G_DNL_MANUFACTURER	"Texas Instruments"
-
-/*
  * Fastboot
  */

include/configs/mx6sabre_common.h +0 -4

index 1f12abd..55b731a 100644
@@ -239,10 +239,6 @@
 #define CONFIG_CMD_USB_MASS_STORAGE
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
 
-#define CONFIG_G_DNL_VENDOR_NUM		0x0525
-#define CONFIG_G_DNL_PRODUCT_NUM	0xa4a5
-#define CONFIG_G_DNL_MANUFACTURER	"FSL"
-
 #define CONFIG_USB_FUNCTION_FASTBOOT
 #define CONFIG_CMD_FASTBOOT
 #define CONFIG_ANDROID_BOOT_IMAGE

include/configs/mx7dsabresd.h +0 -4

index 1cefa94..30a19cc 100644
@@ -254,10 +254,6 @@
 #define CONFIG_CMD_USB_MASS_STORAGE
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
 
-#define CONFIG_G_DNL_VENDOR_NUM		0x0525
-#define CONFIG_G_DNL_PRODUCT_NUM	0xa4a5
-#define CONFIG_G_DNL_MANUFACTURER	"FSL"
-
 /* USB Device Firmware Update support */
 #define CONFIG_CMD_DFU
 #define CONFIG_USB_FUNCTION_DFU

include/configs/nitrogen6x.h +0 -5

index f906bf2..cb249c0 100644
@@ -331,11 +331,6 @@
 #define CONFIG_CMD_USB_MASS_STORAGE
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
 
-/* Netchip IDs */
-#define CONFIG_G_DNL_VENDOR_NUM 0x0525
-#define CONFIG_G_DNL_PRODUCT_NUM 0xa4a5
-#define CONFIG_G_DNL_MANUFACTURER "Boundary"
-
 #define CONFIG_USB_FUNCTION_FASTBOOT
 #define CONFIG_CMD_FASTBOOT
 #define CONFIG_ANDROID_BOOT_IMAGE

include/configs/odroid_xu3.h +0 -5

index 76131cd..e52d7ba 100644
@@ -47,11 +47,6 @@
 #define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_EXYNOS
 
-/* Downloader */
-#define CONFIG_G_DNL_VENDOR_NUM		0x04E8
-#define CONFIG_G_DNL_PRODUCT_NUM	0x6601
-#define CONFIG_G_DNL_MANUFACTURER	"Samsung"
-
 /* DFU */
 #define CONFIG_USB_FUNCTION_DFU
 #define CONFIG_DFU_MMC

include/configs/omap3_beagle.h +0 -3

index aec8352..3fa8d7e 100644
@@ -64,9 +64,6 @@
 #define CONFIG_TWL4030_USB		1
 #define CONFIG_USB_ETHER
 #define CONFIG_USB_ETHER_RNDIS
-#define CONFIG_G_DNL_VENDOR_NUM		0x0451
-#define CONFIG_G_DNL_PRODUCT_NUM	0xd022
-#define CONFIG_G_DNL_MANUFACTURER	"TI"
 #define CONFIG_USB_FUNCTION_FASTBOOT
 #define CONFIG_CMD_FASTBOOT
 #define CONFIG_ANDROID_BOOT_IMAGE

include/configs/omap3_logic.h +0 -3

index 9337b89..0cb62e9 100644
@@ -83,9 +83,6 @@
 #define CONFIG_USB_MUSB_PIO_ONLY
 #define CONFIG_USB_ETHER
 #define CONFIG_USB_ETHER_RNDIS
-#define CONFIG_G_DNL_VENDOR_NUM		0x0451
-#define CONFIG_G_DNL_PRODUCT_NUM	0xd022
-#define CONFIG_G_DNL_MANUFACTURER	"TI"
 #define CONFIG_USB_FUNCTION_FASTBOOT
 #define CONFIG_CMD_FASTBOOT
 #define CONFIG_ANDROID_BOOT_IMAGE

include/configs/omap5_uevm.h +0 -5

index bf92212..10b97a0 100644
@@ -99,11 +99,6 @@
 #define CONFIG_OMAP_EHCI_PHY2_RESET_GPIO 80
 #define CONFIG_OMAP_EHCI_PHY3_RESET_GPIO 79
 
-/* USB GADGET */
-#define CONFIG_G_DNL_MANUFACTURER "Texas Instruments"
-#define CONFIG_G_DNL_VENDOR_NUM 0x0403
-#define CONFIG_G_DNL_PRODUCT_NUM 0xBD00
-
 /* USB Device Firmware Update support */
 #define CONFIG_USB_FUNCTION_DFU
 #define CONFIG_DFU_RAM

include/configs/s5p_goni.h +2 -4

index d101cf2..8520423 100644
@@ -80,13 +80,11 @@
 #define CONFIG_USB_FUNCTION_THOR
 
 /* USB Samsung's IDs */
-#define CONFIG_G_DNL_VENDOR_NUM 0x04E8
-#define CONFIG_G_DNL_PRODUCT_NUM 0x6601
-#define CONFIG_G_DNL_THOR_VENDOR_NUM CONFIG_G_DNL_VENDOR_NUM
+
+#define CONFIG_G_DNL_THOR_VENDOR_NUM 0x04E8
 #define CONFIG_G_DNL_THOR_PRODUCT_NUM 0x685D
 #define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525
 #define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5
-#define CONFIG_G_DNL_MANUFACTURER "Samsung"
 
 /* Actual modem binary size is 16MiB. Add 2MiB for bad block handling */
 #define MTDIDS_DEFAULT		"onenand0=samsung-onenand"

include/configs/siemens-am33x-common.h +0 -3

index d630f04..5b94fad 100644
@@ -243,9 +243,6 @@
 
 /* USB DRACO ID as default */
 #define CONFIG_USBD_HS
-#define CONFIG_G_DNL_VENDOR_NUM 0x0908
-#define CONFIG_G_DNL_PRODUCT_NUM 0x02d2
-#define CONFIG_G_DNL_MANUFACTURER "Siemens AG"
 
 /* USB Device Firmware Update support */
 #define CONFIG_USB_FUNCTION_DFU

include/configs/smartweb.h +0 -5

index bafa8e3..0352379 100644
@@ -178,11 +178,6 @@
 #define CONFIG_SYS_DFU_DATA_BUF_SIZE	SZ_1M
 #define DFU_MANIFEST_POLL_TIMEOUT	25000
 
-/* USB DFU IDs */
-#define CONFIG_G_DNL_VENDOR_NUM 0x0908
-#define CONFIG_G_DNL_PRODUCT_NUM 0x02d2
-#define CONFIG_G_DNL_MANUFACTURER "Siemens AG"
-
 #define CONFIG_SYS_CACHELINE_SIZE	0x2000
 #endif

include/configs/sniper.h +0 -8

index e61b115..2d82a66 100644
@@ -202,14 +202,6 @@
 #define CONFIG_TWL4030_USB
 
 /*
- * Download
- */
-
-#define CONFIG_G_DNL_VENDOR_NUM		0x0451
-#define CONFIG_G_DNL_PRODUCT_NUM	0xd022
-#define CONFIG_G_DNL_MANUFACTURER	"Texas Instruments"
-
-/*
  * Fastboot
  */

include/configs/socfpga_common.h +2 -7

index 2da40f3..0c94bac 100644
@@ -260,13 +260,8 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
 #define DFU_DEFAULT_POLL_TIMEOUT	300
 
 /* USB IDs */
-#define CONFIG_G_DNL_VENDOR_NUM		0x0525	/* NetChip */
-#define CONFIG_G_DNL_PRODUCT_NUM	0xA4A5	/* Linux-USB File-backed Storage Gadget */
-#define CONFIG_G_DNL_UMS_VENDOR_NUM	CONFIG_G_DNL_VENDOR_NUM
-#define CONFIG_G_DNL_UMS_PRODUCT_NUM	CONFIG_G_DNL_PRODUCT_NUM
-#ifndef CONFIG_G_DNL_MANUFACTURER
-#define CONFIG_G_DNL_MANUFACTURER	CONFIG_SYS_VENDOR
-#endif
+#define CONFIG_G_DNL_UMS_VENDOR_NUM	0x0525
+#define CONFIG_G_DNL_UMS_PRODUCT_NUM	0xA4A5
 #endif
 
 /*

include/configs/sunxi-common.h +0 -3

index 6e880a7..9c6c9b6 100644
@@ -342,9 +342,6 @@ extern int soft_i2c_gpio_scl;
 #endif
 
 #ifdef CONFIG_USB_MUSB_GADGET
-#define CONFIG_G_DNL_VENDOR_NUM		0x1f3a
-#define CONFIG_G_DNL_PRODUCT_NUM	0x1010
-#define CONFIG_G_DNL_MANUFACTURER	"Allwinner Technology"
 #define CONFIG_USB_FUNCTION_DFU
 #define CONFIG_USB_FUNCTION_FASTBOOT
 #define CONFIG_USB_FUNCTION_MASS_STORAGE

include/configs/taurus.h +0 -5

index 422b7a1..405ed72 100644
@@ -142,11 +142,6 @@
 #define CONFIG_SYS_DFU_DATA_BUF_SIZE	(SZ_1M)
 #define DFU_MANIFEST_POLL_TIMEOUT	25000
 
-/* USB DFU IDs */
-#define CONFIG_G_DNL_VENDOR_NUM 0x0908
-#define CONFIG_G_DNL_PRODUCT_NUM 0x02d2
-#define CONFIG_G_DNL_MANUFACTURER "Siemens AG"
-
 #define CONFIG_SYS_CACHELINE_SIZE	SZ_8K
 #endif

include/configs/tbs2910.h +0 -3

index 19f35bb..d0734a7 100644
@@ -130,9 +130,6 @@
 #ifdef CONFIG_CMD_USB_MASS_STORAGE
 #define CONFIG_USBD_HS
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
-#define CONFIG_G_DNL_VENDOR_NUM		0x0525
-#define CONFIG_G_DNL_PRODUCT_NUM	0xa4a5
-#define CONFIG_G_DNL_MANUFACTURER	"TBS"
 #endif /* CONFIG_CMD_USB_MASS_STORAGE */
 #define CONFIG_USB_KEYBOARD
 #ifdef CONFIG_USB_KEYBOARD

include/configs/tegra-common-usb-gadget.h +0 -9

index 6b1247c..18851ca 100644
@@ -11,15 +11,6 @@
 #ifndef CONFIG_SPL_BUILD
 /* USB gadget mode support*/
 #define CONFIG_CI_UDC_HAS_HOSTPC
-#ifndef CONFIG_G_DNL_VENDOR_NUM
-#define CONFIG_G_DNL_VENDOR_NUM 0x0955
-#endif
-#ifndef CONFIG_G_DNL_PRODUCT_NUM
-#define CONFIG_G_DNL_PRODUCT_NUM 0x701A
-#endif
-#ifndef CONFIG_G_DNL_MANUFACTURER
-#define CONFIG_G_DNL_MANUFACTURER "NVIDIA"
-#endif
 /* USB mass storage protocol */
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
 #define CONFIG_CMD_USB_MASS_STORAGE

include/configs/warp.h +0 -4

index 11ebbeb..4c3df1d 100644
@@ -79,10 +79,6 @@
 #define CONFIG_CMD_USB_MASS_STORAGE
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
 
-#define CONFIG_G_DNL_VENDOR_NUM		0x0525
-#define CONFIG_G_DNL_PRODUCT_NUM	0xa4a5
-#define CONFIG_G_DNL_MANUFACTURER	"FSL"
-
 #define CONFIG_CMD_DFU
 #define CONFIG_USB_FUNCTION_DFU
 #define CONFIG_DFU_MMC

include/configs/xilinx_zynqmp.h +0 -3

index d877eeb..2f57fb2 100644
@@ -129,9 +129,6 @@
 #define DFU_DEFAULT_POLL_TIMEOUT	300
 #define CONFIG_USB_FUNCTION_DFU
 #define CONFIG_DFU_RAM
-#define CONFIG_G_DNL_VENDOR_NUM		0x03FD
-#define CONFIG_G_DNL_PRODUCT_NUM	0x0300
-#define CONFIG_G_DNL_MANUFACTURER	"Xilinx"
 #define CONFIG_USB_CABLE_CHECK
 #define CONFIG_CMD_DFU
 #define CONFIG_CMD_THOR_DOWNLOAD

include/configs/zynq-common.h +0 -3

index 13e1b32..cb5f934 100644
@@ -104,9 +104,6 @@
 # define DFU_DEFAULT_POLL_TIMEOUT	300
 # define CONFIG_USB_FUNCTION_DFU
 # define CONFIG_DFU_RAM
-# define CONFIG_G_DNL_VENDOR_NUM	0x03FD
-# define CONFIG_G_DNL_PRODUCT_NUM	0x0300
-# define CONFIG_G_DNL_MANUFACTURER	"Xilinx"
 # define CONFIG_USB_CABLE_CHECK
 # define CONFIG_CMD_DFU
 # define CONFIG_CMD_THOR_DOWNLOAD

Signature · 1 line

2.8.0.rc3

Lukasz Majewski

2016-04-12 08:50 UTC #9 lore raw

v3 cover usb: Move DWC3 and some gadget options to Kconfig

In reply to Semen Protsenko

Hi Semen,

Quoted 10 lines

Hi All,
This patch series move next options to Kconfigs/defconfigs:
- CONFIG_USB_DWC3*
- CONFIG_USB_GADGET_VBUS_DRAW
- CONFIG_USB_GADGET_DUALSPEED
- CONFIG_USB_GADGET_DOWNLOAD
- CONFIG_G_DNL_*

Quoted 5 lines

All defconfig files were post-processed via "make savedefconfig" rule to keep correct order of options in defconfigs.
The whole series was tested using buildman tool (for all arm boards).

COuld you share the exact SHA1 of commit on top of which you rebased your code?

It cannot be applied to neither u-boot-usb/master nor v2016.05-rc1.

Signature · 5 lines

Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group

Sam Protsenko

author

2016-04-13 09:33 UTC #10 lore raw

v3 cover usb: Move DWC3 and some gadget options to Kconfig

Hi Lukasz,

Quoted 15 lines · Lukasz Majewski

Hi Semen,
Quoted 13 lines
Hi All,
This patch series move next options to Kconfigs/defconfigs:
- CONFIG_USB_DWC3*
- CONFIG_USB_GADGET_VBUS_DRAW
- CONFIG_USB_GADGET_DUALSPEED
- CONFIG_USB_GADGET_DOWNLOAD
- CONFIG_G_DNL_*
All defconfig files were post-processed via "make savedefconfig" rule to keep correct order of options in defconfigs.

Quoted 8 lines

Quoted 2 lines
The whole series was tested using buildman tool (for all arm boards).
COuld you share the exact SHA1 of commit on top of which you rebased your code?
It cannot be applied to neither u-boot-usb/master nor v2016.05-rc1.

I based my patches on mainline u-boot (git://git.denx.de/u-boot.git),
master branch. More specifically, the SHA1 of commit I rebased my code on top of is:
9dbdc6ebd4db60effebefcf8d541cf598712e3b7

Can you please check if it could be applied? Or maybe I need to rebase my patches on top of u-boot-usb/master and resend them?

Thanks.

Quoted 6 lines

--
Best regards,
Lukasz Majewski
Samsung R&D Institute Poland (SRPOL) | Linux Platform Group

Lukasz Majewski

2016-04-13 10:52 UTC #11 lore raw

v3 cover usb: Move DWC3 and some gadget options to Kconfig

Hi Sam,

Quoted 29 lines

Hi Lukasz,
Quoted 15 lines · Lukasz Majewski
Hi Semen,
Quoted 13 lines
Hi All,
This patch series move next options to Kconfigs/defconfigs:
- CONFIG_USB_DWC3*
- CONFIG_USB_GADGET_VBUS_DRAW
- CONFIG_USB_GADGET_DUALSPEED
- CONFIG_USB_GADGET_DOWNLOAD
- CONFIG_G_DNL_*
All defconfig files were post-processed via "make savedefconfig" rule to keep correct order of options in defconfigs.
Quoted 9 lines
Quoted 3 lines
The whole series was tested using buildman tool (for all arm boards).
COuld you share the exact SHA1 of commit on top of which you rebased your code?
It cannot be applied to neither u-boot-usb/master nor v2016.05-rc1.

Quoted 7 lines

I based my patches on mainline u-boot (git://git.denx.de/u-boot.git),
master branch. More specifically, the SHA1 of commit I rebased my code on top of is:
9dbdc6ebd4db60effebefcf8d541cf598712e3b7
Can you please check if it could be applied? Or maybe I need to rebase my patches on top of u-boot-usb/master and resend them?

I'm rebasing my -dfu tree on top of Marek's u-boot-usb/master, so it would be less work for me in that case.

Quoted 10 lines

Thanks.
Quoted 6 lines
--
Best regards,
Lukasz Majewski
Samsung R&D Institute Poland (SRPOL) | Linux Platform Group

Signature · 5 lines

Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group