From 5b718407ed937fdcd1beeab9f62e42158dee9fa6 Mon Sep 17 00:00:00 2001 From: John Tobias Date: Thu, 7 Apr 2016 16:49:03 -0700 Subject: [PATCH 1/9] USB: g_dnl: Change device class The USB Mass Storage (ums) works in Windows, Linux and OS X (EL Capitan). But, not in OS X (Yosemite). By applying the said patch, it extends the ums support. Signed-off-by: John Tobias Tested-by: Lukasz Majewski Test HW: Odroid XU3 (./test/py UMS + DFU tests) Tested-by: John Tobias Linux: - Run ums to expose all my eMMC partition - shows all correctly - Run ums to expose only 1 partition of my eMMC - show correctly Windows: - Run ums to expose all my eMMC partition - it detects but it prompts, if I want to format it (due to a non windows partition) - Run ums to expose only the FAT32 partition - it show the partition correctly. --- drivers/usb/gadget/g_dnl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/usb/gadget/g_dnl.c b/drivers/usb/gadget/g_dnl.c index 2fa6da4091..bd3aad927b 100644 --- a/drivers/usb/gadget/g_dnl.c +++ b/drivers/usb/gadget/g_dnl.c @@ -58,8 +58,8 @@ static struct usb_device_descriptor device_desc = { .bDescriptorType = USB_DT_DEVICE, .bcdUSB = __constant_cpu_to_le16(0x0200), - .bDeviceClass = USB_CLASS_COMM, - .bDeviceSubClass = 0x02, /*0x02:CDC-modem , 0x00:CDC-serial*/ + .bDeviceClass = USB_CLASS_PER_INTERFACE, + .bDeviceSubClass = 0, /*0x02:CDC-modem , 0x00:CDC-serial*/ .idVendor = __constant_cpu_to_le16(CONFIG_G_DNL_VENDOR_NUM), .idProduct = __constant_cpu_to_le16(CONFIG_G_DNL_PRODUCT_NUM), From a2e3a1d86c17b457056a4b65d8c045d98a75ba0f Mon Sep 17 00:00:00 2001 From: John Tobias Date: Wed, 13 Apr 2016 12:06:51 -0700 Subject: [PATCH 2/9] usb: ums - expose selected partition/s By applying this patch, it will give us some flexibility to expose a selected partition/s. e.g: 1. To expose several partitions ums 0 mmc 0:1,0:6 2. To expose the all partitions ums 0 mmc 0:0 3. To expose multiple partititions on several devices ums 0 mmc 0:1,1:6 4. It support legacy format ums 0 mmc 0 Signed-off-by: John Tobias --- cmd/usb_mass_storage.c | 39 +++++++++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/cmd/usb_mass_storage.c b/cmd/usb_mass_storage.c index 14eed980df..ac53a73310 100644 --- a/cmd/usb_mass_storage.c +++ b/cmd/usb_mass_storage.c @@ -50,14 +50,16 @@ static void ums_fini(void) #define UMS_NAME_LEN 16 -static int ums_init(const char *devtype, const char *devnums) +static int ums_init(const char *devtype, const char *devnums_part_str) { - char *s, *t, *devnum, *name; + char *s, *t, *devnum_part_str, *name; struct blk_desc *block_dev; + disk_partition_t info; + int partnum; int ret; struct ums *ums_new; - s = strdup(devnums); + s = strdup(devnums_part_str); if (!s) return -1; @@ -65,14 +67,23 @@ static int ums_init(const char *devtype, const char *devnums) ums_count = 0; for (;;) { - devnum = strsep(&t, ","); - if (!devnum) + devnum_part_str = strsep(&t, ","); + if (!devnum_part_str) break; - ret = blk_get_device_by_str(devtype, devnum, &block_dev); - if (ret < 0) + partnum = blk_get_device_part_str(devtype, devnum_part_str, + &block_dev, &info, 1); + + if (partnum < 0) goto cleanup; + /* Check if the argument is in legacy format. If yes, + * expose all partitions by setting the partnum = 0 + * e.g. ums 0 mmc 0 + */ + if (!strchr(devnum_part_str, ':')) + partnum = 0; + /* f_mass_storage.c assumes SECTOR_SIZE sectors */ if (block_dev->blksz != SECTOR_SIZE) { ret = -1; @@ -86,10 +97,18 @@ static int ums_init(const char *devtype, const char *devnums) } ums = ums_new; + /* if partnum = 0, expose all partitions */ + if (partnum == 0) { + ums[ums_count].start_sector = 0; + ums[ums_count].num_sectors = block_dev->lba; + } else { + ums[ums_count].start_sector = info.start; + ums[ums_count].num_sectors = info.size; + } + ums[ums_count].read_sector = ums_read_sector; ums[ums_count].write_sector = ums_write_sector; - ums[ums_count].start_sector = 0; - ums[ums_count].num_sectors = block_dev->lba; + name = malloc(UMS_NAME_LEN); if (!name) { ret = -1; @@ -230,6 +249,6 @@ cleanup_ums_init: U_BOOT_CMD(ums, 4, 1, do_usb_mass_storage, "Use the UMS [USB Mass Storage]", - " [] e.g. ums 0 mmc 0\n" + " [] e.g. ums 0 mmc 0\n" " devtype defaults to mmc" ); From a59a77f86318550168d5ceec36a7ca0add42d778 Mon Sep 17 00:00:00 2001 From: Sam Protsenko Date: Wed, 13 Apr 2016 14:20:24 +0300 Subject: [PATCH 3/9] usb: gadget: Move CONFIG_USB_GADGET_VBUS_DRAW to Kconfig 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 --- 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(-) diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index f4698f469e..cfd8ce88ee 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig @@ -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 diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 29b693a40b..8d68d60520 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -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 diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index fd3f6a718d..0dd9c7a759 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -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 diff --git a/include/configs/baltos.h b/include/configs/baltos.h index bfe3fa37f4..529cf1c476 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -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 diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index 6c860a6462..82bf92acb4 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -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 diff --git a/include/configs/bcm28155_ap.h b/include/configs/bcm28155_ap.h index cf25bdebe8..387895b3cf 100644 --- a/include/configs/bcm28155_ap.h +++ b/include/configs/bcm28155_ap.h @@ -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 diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h index 63e3b94bb5..3f3b69df1a 100644 --- a/include/configs/cgtqmx6eval.h +++ b/include/configs/cgtqmx6eval.h @@ -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 diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 7f57a54061..63dbe12619 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -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 diff --git a/include/configs/corvus.h b/include/configs/corvus.h index fcf2bd6d57..b8c441ea26 100644 --- a/include/configs/corvus.h +++ b/include/configs/corvus.h @@ -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 diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 7734e8db94..e9facae6de 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -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 diff --git a/include/configs/exynos4-common.h b/include/configs/exynos4-common.h index 008d24c417..c8e5397d4e 100644 --- a/include/configs/exynos4-common.h +++ b/include/configs/exynos4-common.h @@ -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 diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 793b3fb88e..62f3468189 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -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 diff --git a/include/configs/kc1.h b/include/configs/kc1.h index ee7d9ce45a..d8aa182053 100644 --- a/include/configs/kc1.h +++ b/include/configs/kc1.h @@ -185,7 +185,6 @@ #define CONFIG_USB_MUSB_OMAP2PLUS #define CONFIG_USB_GADGET_DUALSPEED -#define CONFIG_USB_GADGET_VBUS_DRAW 0 /* * Download diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index 3e1b760882..f097176209 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -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 diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h index da1d26f350..f9977a2c19 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -264,7 +264,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 diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index 3604e44c0d..a50829ed55 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -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 diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h index 01d08dc582..e4986b0b18 100644 --- a/include/configs/odroid_xu3.h +++ b/include/configs/odroid_xu3.h @@ -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 diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 2112d9fe94..17d8a86b4f 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -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 diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index 304e1ce31c..7e802e9901 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -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 diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h index a5cfa0c5ca..09beb74240 100644 --- a/include/configs/omap5_uevm.h +++ b/include/configs/omap5_uevm.h @@ -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 diff --git a/include/configs/pengwyn.h b/include/configs/pengwyn.h index 1a670cbd63..ec3fcba0a5 100644 --- a/include/configs/pengwyn.h +++ b/include/configs/pengwyn.h @@ -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 diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index 07a5134999..919c60ea5b 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -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 diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index df2a514b51..df4e734573 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -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 diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index db820ba7fe..0586aec791 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -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 diff --git a/include/configs/sniper.h b/include/configs/sniper.h index 18a379d4fd..12090a30e9 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -202,7 +202,6 @@ #define CONFIG_TWL4030_USB #define CONFIG_USB_GADGET_DUALSPEED -#define CONFIG_USB_GADGET_VBUS_DRAW 0 /* * Download diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 3e50892568..bdb06e7e53 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -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 diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 8f11eb90c1..b5d05cd735 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -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 diff --git a/include/configs/taurus.h b/include/configs/taurus.h index 5b190f6225..0b04b3a697 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -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 diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index 1b5046af2f..715994c3fc 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -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 diff --git a/include/configs/tegra-common-usb-gadget.h b/include/configs/tegra-common-usb-gadget.h index c3a01514ca..ec034a1f87 100644 --- a/include/configs/tegra-common-usb-gadget.h +++ b/include/configs/tegra-common-usb-gadget.h @@ -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 diff --git a/include/configs/warp.h b/include/configs/warp.h index cb93629589..80c4e38259 100644 --- a/include/configs/warp.h +++ b/include/configs/warp.h @@ -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 diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index f7b4643708..9493843464 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -127,7 +127,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 diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 49d9fd059f..e4d1111f49 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -105,7 +105,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" From 3457bbaf22a8fb6884d52fc3af997c187e930f06 Mon Sep 17 00:00:00 2001 From: Sam Protsenko Date: Wed, 13 Apr 2016 14:20:25 +0300 Subject: [PATCH 4/9] usb: gadget: Move CONFIG_USB_GADGET_DUALSPEED to Kconfig 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 --- 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 diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig index bda87272c6..3562e5860b 100644 --- a/configs/am335x_baltos_defconfig +++ b/configs/am335x_baltos_defconfig @@ -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 diff --git a/configs/am335x_boneblack_defconfig b/configs/am335x_boneblack_defconfig index 8b6fa20be6..46ac47181a 100644 --- a/configs/am335x_boneblack_defconfig +++ b/configs/am335x_boneblack_defconfig @@ -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 diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig index 70fc5d70bf..8208b3cb95 100644 --- a/configs/am335x_boneblack_vboot_defconfig +++ b/configs/am335x_boneblack_vboot_defconfig @@ -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 diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig index 8eaa123986..b59ff810de 100644 --- a/configs/am335x_evm_defconfig +++ b/configs/am335x_evm_defconfig @@ -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 diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig index 85a0ba9e57..9458fd1c9e 100644 --- a/configs/am335x_evm_nor_defconfig +++ b/configs/am335x_evm_nor_defconfig @@ -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 diff --git a/configs/am335x_evm_norboot_defconfig b/configs/am335x_evm_norboot_defconfig index f3a26c3c9e..5a84150ebc 100644 --- a/configs/am335x_evm_norboot_defconfig +++ b/configs/am335x_evm_norboot_defconfig @@ -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 diff --git a/configs/am335x_evm_spiboot_defconfig b/configs/am335x_evm_spiboot_defconfig index 92eb46cd8b..c9e0761bf1 100644 --- a/configs/am335x_evm_spiboot_defconfig +++ b/configs/am335x_evm_spiboot_defconfig @@ -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 diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig index 453714bc28..e8b2b913e6 100644 --- a/configs/am335x_evm_usbspl_defconfig +++ b/configs/am335x_evm_usbspl_defconfig @@ -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 diff --git a/configs/am335x_gp_evm_defconfig b/configs/am335x_gp_evm_defconfig index 0c7eda7c06..f888211b12 100644 --- a/configs/am335x_gp_evm_defconfig +++ b/configs/am335x_gp_evm_defconfig @@ -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 diff --git a/configs/am437x_gp_evm_defconfig b/configs/am437x_gp_evm_defconfig index 356f6fd9d8..e628bd4074 100644 --- a/configs/am437x_gp_evm_defconfig +++ b/configs/am437x_gp_evm_defconfig @@ -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 diff --git a/configs/am437x_sk_evm_defconfig b/configs/am437x_sk_evm_defconfig index 2e2827fe22..d556a7fe95 100644 --- a/configs/am437x_sk_evm_defconfig +++ b/configs/am437x_sk_evm_defconfig @@ -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 diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig index cc830061df..9b746bfe1e 100644 --- a/configs/am43xx_evm_defconfig +++ b/configs/am43xx_evm_defconfig @@ -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 diff --git a/configs/am43xx_evm_ethboot_defconfig b/configs/am43xx_evm_ethboot_defconfig index a720c14a45..30a344cbd9 100644 --- a/configs/am43xx_evm_ethboot_defconfig +++ b/configs/am43xx_evm_ethboot_defconfig @@ -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 diff --git a/configs/am43xx_evm_qspiboot_defconfig b/configs/am43xx_evm_qspiboot_defconfig index 6db389b74f..75c75dc783 100644 --- a/configs/am43xx_evm_qspiboot_defconfig +++ b/configs/am43xx_evm_qspiboot_defconfig @@ -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 diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig index cbaf5a588f..9c2234f956 100644 --- a/configs/am43xx_evm_usbhost_boot_defconfig +++ b/configs/am43xx_evm_usbhost_boot_defconfig @@ -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 diff --git a/configs/apalis_t30_defconfig b/configs/apalis_t30_defconfig index 152d06f069..a8b4621f91 100644 --- a/configs/apalis_t30_defconfig +++ b/configs/apalis_t30_defconfig @@ -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 diff --git a/configs/bcm11130_defconfig b/configs/bcm11130_defconfig index 222c319298..11d20c0014 100644 --- a/configs/bcm11130_defconfig +++ b/configs/bcm11130_defconfig @@ -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 diff --git a/configs/bcm11130_nand_defconfig b/configs/bcm11130_nand_defconfig index 7e1e682215..b7336b4ba1 100644 --- a/configs/bcm11130_nand_defconfig +++ b/configs/bcm11130_nand_defconfig @@ -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 diff --git a/configs/bcm28155_ap_defconfig b/configs/bcm28155_ap_defconfig index ba57944b20..15d3b8f3be 100644 --- a/configs/bcm28155_ap_defconfig +++ b/configs/bcm28155_ap_defconfig @@ -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 diff --git a/configs/bcm28155_w1d_defconfig b/configs/bcm28155_w1d_defconfig index 36849d545b..d06130ce2b 100644 --- a/configs/bcm28155_w1d_defconfig +++ b/configs/bcm28155_w1d_defconfig @@ -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 diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig index 9e01f31819..1ab24bd277 100644 --- a/configs/beaver_defconfig +++ b/configs/beaver_defconfig @@ -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 diff --git a/configs/birdland_bav335a_defconfig b/configs/birdland_bav335a_defconfig index 2a81ded17e..807c945f95 100644 --- a/configs/birdland_bav335a_defconfig +++ b/configs/birdland_bav335a_defconfig @@ -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 diff --git a/configs/birdland_bav335b_defconfig b/configs/birdland_bav335b_defconfig index d2b35cd951..f923cfd835 100644 --- a/configs/birdland_bav335b_defconfig +++ b/configs/birdland_bav335b_defconfig @@ -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 diff --git a/configs/cgtqmx6eval_defconfig b/configs/cgtqmx6eval_defconfig index 20b149231a..c7347257ea 100644 --- a/configs/cgtqmx6eval_defconfig +++ b/configs/cgtqmx6eval_defconfig @@ -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 diff --git a/configs/colibri_t20_defconfig b/configs/colibri_t20_defconfig index 3813e9662f..6f93f1cd2f 100644 --- a/configs/colibri_t20_defconfig +++ b/configs/colibri_t20_defconfig @@ -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 diff --git a/configs/colibri_t30_defconfig b/configs/colibri_t30_defconfig index 6fd877b73b..74f90db83e 100644 --- a/configs/colibri_t30_defconfig +++ b/configs/colibri_t30_defconfig @@ -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 diff --git a/configs/colibri_vf_defconfig b/configs/colibri_vf_defconfig index 267a4536b3..ccba59bad6 100644 --- a/configs/colibri_vf_defconfig +++ b/configs/colibri_vf_defconfig @@ -19,3 +19,4 @@ CONFIG_FSL_LPUART=y CONFIG_FSL_DSPI=y CONFIG_USB=y CONFIG_USB_GADGET=y +CONFIG_CI_UDC=y diff --git a/configs/corvus_defconfig b/configs/corvus_defconfig index 3a9e4d705a..9f38c37d4e 100644 --- a/configs/corvus_defconfig +++ b/configs/corvus_defconfig @@ -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 diff --git a/configs/dalmore_defconfig b/configs/dalmore_defconfig index 5e696a1499..5b54e75ef8 100644 --- a/configs/dalmore_defconfig +++ b/configs/dalmore_defconfig @@ -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 diff --git a/configs/dra72_evm_defconfig b/configs/dra72_evm_defconfig index da249926d9..47fb0d7160 100644 --- a/configs/dra72_evm_defconfig +++ b/configs/dra72_evm_defconfig @@ -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 diff --git a/configs/dra74_evm_defconfig b/configs/dra74_evm_defconfig index 9039b15df3..a15b65b3e3 100644 --- a/configs/dra74_evm_defconfig +++ b/configs/dra74_evm_defconfig @@ -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 diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig index 9be4c2da70..2d504a59b9 100644 --- a/configs/dra7xx_evm_defconfig +++ b/configs/dra7xx_evm_defconfig @@ -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 diff --git a/configs/dra7xx_evm_qspiboot_defconfig b/configs/dra7xx_evm_qspiboot_defconfig index b77c7c31f7..6af9619942 100644 --- a/configs/dra7xx_evm_qspiboot_defconfig +++ b/configs/dra7xx_evm_qspiboot_defconfig @@ -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 diff --git a/configs/dra7xx_evm_uart3_defconfig b/configs/dra7xx_evm_uart3_defconfig index 1a1fb6de73..80ae9dd007 100644 --- a/configs/dra7xx_evm_uart3_defconfig +++ b/configs/dra7xx_evm_uart3_defconfig @@ -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 diff --git a/configs/draco_defconfig b/configs/draco_defconfig index ec339853e5..be3ec0a525 100644 --- a/configs/draco_defconfig +++ b/configs/draco_defconfig @@ -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 diff --git a/configs/e2220-1170_defconfig b/configs/e2220-1170_defconfig index 196950da86..e0790aba45 100644 --- a/configs/e2220-1170_defconfig +++ b/configs/e2220-1170_defconfig @@ -18,3 +18,4 @@ CONFIG_TEGRA114_SPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_GADGET=y +CONFIG_CI_UDC=y diff --git a/configs/gwventana_defconfig b/configs/gwventana_defconfig index 788ba9dd2a..5228c845b5 100644 --- a/configs/gwventana_defconfig +++ b/configs/gwventana_defconfig @@ -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 diff --git a/configs/jetson-tk1_defconfig b/configs/jetson-tk1_defconfig index 5e876242a1..3078386448 100644 --- a/configs/jetson-tk1_defconfig +++ b/configs/jetson-tk1_defconfig @@ -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 diff --git a/configs/ma5d4evk_defconfig b/configs/ma5d4evk_defconfig index 39ce550ff4..1b2b722d7d 100644 --- a/configs/ma5d4evk_defconfig +++ b/configs/ma5d4evk_defconfig @@ -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 diff --git a/configs/mx6dlsabreauto_defconfig b/configs/mx6dlsabreauto_defconfig index ba53017787..27ace9086d 100644 --- a/configs/mx6dlsabreauto_defconfig +++ b/configs/mx6dlsabreauto_defconfig @@ -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 diff --git a/configs/mx6dlsabresd_defconfig b/configs/mx6dlsabresd_defconfig index 7a67bf5fa3..d085ef78b1 100644 --- a/configs/mx6dlsabresd_defconfig +++ b/configs/mx6dlsabresd_defconfig @@ -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 diff --git a/configs/mx6qpsabreauto_defconfig b/configs/mx6qpsabreauto_defconfig index c27aa3875c..4273a3283a 100644 --- a/configs/mx6qpsabreauto_defconfig +++ b/configs/mx6qpsabreauto_defconfig @@ -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 diff --git a/configs/mx6qsabreauto_defconfig b/configs/mx6qsabreauto_defconfig index 7699cbb33c..60262cd3c3 100644 --- a/configs/mx6qsabreauto_defconfig +++ b/configs/mx6qsabreauto_defconfig @@ -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 diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig index 324f46f1e0..917362af13 100644 --- a/configs/mx6qsabrelite_defconfig +++ b/configs/mx6qsabrelite_defconfig @@ -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 diff --git a/configs/mx6qsabresd_defconfig b/configs/mx6qsabresd_defconfig index 6c9e27e927..333eb6721f 100644 --- a/configs/mx6qsabresd_defconfig +++ b/configs/mx6qsabresd_defconfig @@ -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 diff --git a/configs/mx6sabresd_spl_defconfig b/configs/mx6sabresd_spl_defconfig index 131bd21919..2e0363fef6 100644 --- a/configs/mx6sabresd_spl_defconfig +++ b/configs/mx6sabresd_spl_defconfig @@ -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 diff --git a/configs/mx7dsabresd_defconfig b/configs/mx7dsabresd_defconfig index 137369c0de..d106d8985e 100644 --- a/configs/mx7dsabresd_defconfig +++ b/configs/mx7dsabresd_defconfig @@ -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 diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig index 54f11e9051..7ba591a30b 100644 --- a/configs/nitrogen6dl2g_defconfig +++ b/configs/nitrogen6dl2g_defconfig @@ -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 diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig index f2ea84186c..3b46fb6e43 100644 --- a/configs/nitrogen6dl_defconfig +++ b/configs/nitrogen6dl_defconfig @@ -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 diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig index cf654d703b..6049891c93 100644 --- a/configs/nitrogen6q2g_defconfig +++ b/configs/nitrogen6q2g_defconfig @@ -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 diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig index de8bb2266f..ce5b61fd00 100644 --- a/configs/nitrogen6q_defconfig +++ b/configs/nitrogen6q_defconfig @@ -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 diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig index 6030afca99..2e264f29eb 100644 --- a/configs/nitrogen6s1g_defconfig +++ b/configs/nitrogen6s1g_defconfig @@ -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 diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig index fef827ed32..39b381f8e2 100644 --- a/configs/nitrogen6s_defconfig +++ b/configs/nitrogen6s_defconfig @@ -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 diff --git a/configs/novena_defconfig b/configs/novena_defconfig index 9217823e7d..f28d8845aa 100644 --- a/configs/novena_defconfig +++ b/configs/novena_defconfig @@ -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 diff --git a/configs/nyan-big_defconfig b/configs/nyan-big_defconfig index de7e9eb6a7..dc965cc1bb 100644 --- a/configs/nyan-big_defconfig +++ b/configs/nyan-big_defconfig @@ -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 diff --git a/configs/odroid-xu3_defconfig b/configs/odroid-xu3_defconfig index a5f25cd6f9..4548cf0496 100644 --- a/configs/odroid-xu3_defconfig +++ b/configs/odroid-xu3_defconfig @@ -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 diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig index 1634ed6622..dbdbf96666 100644 --- a/configs/odroid_defconfig +++ b/configs/odroid_defconfig @@ -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 diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig index 798a7e55e5..ab3cac448c 100644 --- a/configs/omap3_beagle_defconfig +++ b/configs/omap3_beagle_defconfig @@ -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 diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig index 02202d5edb..fefe209e97 100644 --- a/configs/omap3_logic_defconfig +++ b/configs/omap3_logic_defconfig @@ -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 diff --git a/configs/omap5_uevm_defconfig b/configs/omap5_uevm_defconfig index 50d83726c4..3fc75df353 100644 --- a/configs/omap5_uevm_defconfig +++ b/configs/omap5_uevm_defconfig @@ -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 diff --git a/configs/origen_defconfig b/configs/origen_defconfig index eda222522c..2ce71d46bc 100644 --- a/configs/origen_defconfig +++ b/configs/origen_defconfig @@ -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 diff --git a/configs/p2371-0000_defconfig b/configs/p2371-0000_defconfig index b6f2954603..4cff742136 100644 --- a/configs/p2371-0000_defconfig +++ b/configs/p2371-0000_defconfig @@ -19,3 +19,4 @@ CONFIG_TEGRA114_SPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_GADGET=y +CONFIG_CI_UDC=y diff --git a/configs/p2371-2180_defconfig b/configs/p2371-2180_defconfig index f7cc8e033b..cd0d325f9a 100644 --- a/configs/p2371-2180_defconfig +++ b/configs/p2371-2180_defconfig @@ -21,3 +21,4 @@ CONFIG_TEGRA114_SPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_GADGET=y +CONFIG_CI_UDC=y diff --git a/configs/p2571_defconfig b/configs/p2571_defconfig index 4d0986f221..65d788a625 100644 --- a/configs/p2571_defconfig +++ b/configs/p2571_defconfig @@ -19,3 +19,4 @@ CONFIG_TEGRA114_SPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_GADGET=y +CONFIG_CI_UDC=y diff --git a/configs/pcm051_rev1_defconfig b/configs/pcm051_rev1_defconfig index b74b372cb0..b7c5466a94 100644 --- a/configs/pcm051_rev1_defconfig +++ b/configs/pcm051_rev1_defconfig @@ -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 diff --git a/configs/pcm051_rev3_defconfig b/configs/pcm051_rev3_defconfig index 18be2a0513..cb393928ee 100644 --- a/configs/pcm051_rev3_defconfig +++ b/configs/pcm051_rev3_defconfig @@ -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 diff --git a/configs/pengwyn_defconfig b/configs/pengwyn_defconfig index 237b4c7edc..90ca1d268f 100644 --- a/configs/pengwyn_defconfig +++ b/configs/pengwyn_defconfig @@ -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 diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig index 88d75b5fc2..13e27b5453 100644 --- a/configs/pxm2_defconfig +++ b/configs/pxm2_defconfig @@ -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 diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig index 8c3c735fab..6f92d841a0 100644 --- a/configs/rastaban_defconfig +++ b/configs/rastaban_defconfig @@ -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 diff --git a/configs/rut_defconfig b/configs/rut_defconfig index 2fb5c4c7f0..d9367b3c1a 100644 --- a/configs/rut_defconfig +++ b/configs/rut_defconfig @@ -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 diff --git a/configs/s5p_goni_defconfig b/configs/s5p_goni_defconfig index eb0604e805..89c11953bd 100644 --- a/configs/s5p_goni_defconfig +++ b/configs/s5p_goni_defconfig @@ -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 diff --git a/configs/s5pc210_universal_defconfig b/configs/s5pc210_universal_defconfig index 7f27b4ceec..dfcf4b7262 100644 --- a/configs/s5pc210_universal_defconfig +++ b/configs/s5pc210_universal_defconfig @@ -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 diff --git a/configs/sama5d2_xplained_mmc_defconfig b/configs/sama5d2_xplained_mmc_defconfig index 7f89698fba..b77c2b5a70 100644 --- a/configs/sama5d2_xplained_mmc_defconfig +++ b/configs/sama5d2_xplained_mmc_defconfig @@ -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 diff --git a/configs/sama5d2_xplained_spiflash_defconfig b/configs/sama5d2_xplained_spiflash_defconfig index 28318faff4..5b942b506c 100644 --- a/configs/sama5d2_xplained_spiflash_defconfig +++ b/configs/sama5d2_xplained_spiflash_defconfig @@ -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 diff --git a/configs/sama5d3xek_mmc_defconfig b/configs/sama5d3xek_mmc_defconfig index f8cb30951d..969fb4b24d 100644 --- a/configs/sama5d3xek_mmc_defconfig +++ b/configs/sama5d3xek_mmc_defconfig @@ -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 diff --git a/configs/sama5d3xek_nandflash_defconfig b/configs/sama5d3xek_nandflash_defconfig index 3a7cc7da72..6e242e0094 100644 --- a/configs/sama5d3xek_nandflash_defconfig +++ b/configs/sama5d3xek_nandflash_defconfig @@ -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 diff --git a/configs/sama5d3xek_spiflash_defconfig b/configs/sama5d3xek_spiflash_defconfig index e562f5a23a..2cceb57988 100644 --- a/configs/sama5d3xek_spiflash_defconfig +++ b/configs/sama5d3xek_spiflash_defconfig @@ -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 diff --git a/configs/sama5d4_xplained_mmc_defconfig b/configs/sama5d4_xplained_mmc_defconfig index c0c04168b7..e26bb59502 100644 --- a/configs/sama5d4_xplained_mmc_defconfig +++ b/configs/sama5d4_xplained_mmc_defconfig @@ -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 diff --git a/configs/sama5d4_xplained_nandflash_defconfig b/configs/sama5d4_xplained_nandflash_defconfig index 96aefc712a..b2067b9e59 100644 --- a/configs/sama5d4_xplained_nandflash_defconfig +++ b/configs/sama5d4_xplained_nandflash_defconfig @@ -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 diff --git a/configs/sama5d4_xplained_spiflash_defconfig b/configs/sama5d4_xplained_spiflash_defconfig index b9d1c3ccb7..53ff55b94c 100644 --- a/configs/sama5d4_xplained_spiflash_defconfig +++ b/configs/sama5d4_xplained_spiflash_defconfig @@ -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 diff --git a/configs/sama5d4ek_mmc_defconfig b/configs/sama5d4ek_mmc_defconfig index 2a17e208f7..2b6f4ac75a 100644 --- a/configs/sama5d4ek_mmc_defconfig +++ b/configs/sama5d4ek_mmc_defconfig @@ -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 diff --git a/configs/sama5d4ek_nandflash_defconfig b/configs/sama5d4ek_nandflash_defconfig index f92fe50630..190a8e9fb3 100644 --- a/configs/sama5d4ek_nandflash_defconfig +++ b/configs/sama5d4ek_nandflash_defconfig @@ -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 diff --git a/configs/sama5d4ek_spiflash_defconfig b/configs/sama5d4ek_spiflash_defconfig index c5a34314d3..9b5faa0158 100644 --- a/configs/sama5d4ek_spiflash_defconfig +++ b/configs/sama5d4ek_spiflash_defconfig @@ -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 diff --git a/configs/sansa_fuze_plus_defconfig b/configs/sansa_fuze_plus_defconfig index b8949aa61f..78df0acfdf 100644 --- a/configs/sansa_fuze_plus_defconfig +++ b/configs/sansa_fuze_plus_defconfig @@ -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 diff --git a/configs/socfpga_arria5_defconfig b/configs/socfpga_arria5_defconfig index 087d6f15f3..372b312b4f 100644 --- a/configs/socfpga_arria5_defconfig +++ b/configs/socfpga_arria5_defconfig @@ -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 diff --git a/configs/socfpga_cyclone5_defconfig b/configs/socfpga_cyclone5_defconfig index cef644e767..b4de001554 100644 --- a/configs/socfpga_cyclone5_defconfig +++ b/configs/socfpga_cyclone5_defconfig @@ -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 diff --git a/configs/socfpga_de0_nano_soc_defconfig b/configs/socfpga_de0_nano_soc_defconfig index c0ffad213b..a03d161405 100644 --- a/configs/socfpga_de0_nano_soc_defconfig +++ b/configs/socfpga_de0_nano_soc_defconfig @@ -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 diff --git a/configs/socfpga_mcvevk_defconfig b/configs/socfpga_mcvevk_defconfig index e01282cda0..d5d5a5c007 100644 --- a/configs/socfpga_mcvevk_defconfig +++ b/configs/socfpga_mcvevk_defconfig @@ -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 diff --git a/configs/socfpga_sockit_defconfig b/configs/socfpga_sockit_defconfig index 8feb5a357f..52d1d18861 100644 --- a/configs/socfpga_sockit_defconfig +++ b/configs/socfpga_sockit_defconfig @@ -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 diff --git a/configs/socfpga_socrates_defconfig b/configs/socfpga_socrates_defconfig index 1b3c3dfe97..902b4d2a48 100644 --- a/configs/socfpga_socrates_defconfig +++ b/configs/socfpga_socrates_defconfig @@ -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 diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig index d0fda48d0b..dc8be7665e 100644 --- a/configs/tbs2910_defconfig +++ b/configs/tbs2910_defconfig @@ -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 diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig index 39c85953b5..95d516f23d 100644 --- a/configs/thuban_defconfig +++ b/configs/thuban_defconfig @@ -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 diff --git a/configs/trats2_defconfig b/configs/trats2_defconfig index 24656ef5b4..60fbab973c 100644 --- a/configs/trats2_defconfig +++ b/configs/trats2_defconfig @@ -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 diff --git a/configs/trats_defconfig b/configs/trats_defconfig index e48fae8c6d..079233abec 100644 --- a/configs/trats_defconfig +++ b/configs/trats_defconfig @@ -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 diff --git a/configs/venice2_defconfig b/configs/venice2_defconfig index a7515ab5bd..49ff5330c9 100644 --- a/configs/venice2_defconfig +++ b/configs/venice2_defconfig @@ -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 diff --git a/configs/vinco_defconfig b/configs/vinco_defconfig index a16f376255..565577d3c6 100644 --- a/configs/vinco_defconfig +++ b/configs/vinco_defconfig @@ -13,3 +13,4 @@ CONFIG_NETDEVICES=y CONFIG_ETH_DESIGNWARE=y CONFIG_USB=y CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_ATMEL_USBA=y diff --git a/configs/warp_defconfig b/configs/warp_defconfig index e37158c0a5..c7d185cbdb 100644 --- a/configs/warp_defconfig +++ b/configs/warp_defconfig @@ -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 diff --git a/configs/xfi3_defconfig b/configs/xfi3_defconfig index 437e018edf..652e443e3d 100644 --- a/configs/xfi3_defconfig +++ b/configs/xfi3_defconfig @@ -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 diff --git a/configs/xilinx_zynqmp_ep_defconfig b/configs/xilinx_zynqmp_ep_defconfig index daafb616c8..86d65dc8f1 100644 --- a/configs/xilinx_zynqmp_ep_defconfig +++ b/configs/xilinx_zynqmp_ep_defconfig @@ -38,5 +38,6 @@ CONFIG_NAND_ARASAN=y CONFIG_DM_ETH=y CONFIG_ZYNQ_GEM=y CONFIG_USB=y +CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y # CONFIG_REGEX is not set diff --git a/configs/zynq_picozed_defconfig b/configs/zynq_picozed_defconfig index c730f3c3f4..28fbd26cd7 100644 --- a/configs/zynq_picozed_defconfig +++ b/configs/zynq_picozed_defconfig @@ -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 diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig index e8d28e4f61..e561784360 100644 --- a/configs/zynq_zc702_defconfig +++ b/configs/zynq_zc702_defconfig @@ -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 diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig index d19108f804..d3a0f23628 100644 --- a/configs/zynq_zc706_defconfig +++ b/configs/zynq_zc706_defconfig @@ -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 diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig index b13de1069e..63512dd500 100644 --- a/configs/zynq_zed_defconfig +++ b/configs/zynq_zed_defconfig @@ -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 diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig index d2f81101b9..e397acbd5f 100644 --- a/configs/zynq_zybo_defconfig +++ b/configs/zynq_zybo_defconfig @@ -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 diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index bccf43e4cf..da3ec2fa75 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig @@ -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" diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig new file mode 100644 index 0000000000..debc74baa1 --- /dev/null +++ b/drivers/usb/dwc3/Kconfig @@ -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. diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index cfd8ce88ee..5838d6e8de 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig @@ -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 diff --git a/drivers/usb/musb-new/Kconfig b/drivers/usb/musb-new/Kconfig index 4e8a5432ef..c264859b6c 100644 --- a/drivers/usb/musb-new/Kconfig +++ b/drivers/usb/musb-new/Kconfig @@ -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. diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 8d68d60520..f0e13b81b5 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -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 diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index fae81380cd..75fe5588d3 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -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 */ diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 0dd9c7a759..8bea4c26b7 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -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 /* diff --git a/include/configs/baltos.h b/include/configs/baltos.h index 529cf1c476..8280e6034a 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -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 diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index 82bf92acb4..c223931355 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -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 diff --git a/include/configs/bcm28155_ap.h b/include/configs/bcm28155_ap.h index 387895b3cf..b431781ac1 100644 --- a/include/configs/bcm28155_ap.h +++ b/include/configs/bcm28155_ap.h @@ -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 diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h index 3f3b69df1a..db207b9e2d 100644 --- a/include/configs/cgtqmx6eval.h +++ b/include/configs/cgtqmx6eval.h @@ -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 diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 63dbe12619..3652d6101b 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -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 diff --git a/include/configs/corvus.h b/include/configs/corvus.h index b8c441ea26..81ebda4fe2 100644 --- a/include/configs/corvus.h +++ b/include/configs/corvus.h @@ -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 diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index e9facae6de..a230896396 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -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 diff --git a/include/configs/exynos4-common.h b/include/configs/exynos4-common.h index c8e5397d4e..7973991af6 100644 --- a/include/configs/exynos4-common.h +++ b/include/configs/exynos4-common.h @@ -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 diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 62f3468189..711777c28c 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -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 diff --git a/include/configs/kc1.h b/include/configs/kc1.h index d8aa182053..6a487f29f3 100644 --- a/include/configs/kc1.h +++ b/include/configs/kc1.h @@ -184,8 +184,6 @@ #define CONFIG_USB_MUSB_PIO_ONLY #define CONFIG_USB_MUSB_OMAP2PLUS -#define CONFIG_USB_GADGET_DUALSPEED - /* * Download */ diff --git a/include/configs/kwb.h b/include/configs/kwb.h index 1f2d2a42c3..4ec4e33899 100644 --- a/include/configs/kwb.h +++ b/include/configs/kwb.h @@ -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 diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h index e061a101ae..324f1ce5a4 100644 --- a/include/configs/ma5d4evk.h +++ b/include/configs/ma5d4evk.h @@ -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" diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index f097176209..249554c338 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -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 diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h index f9977a2c19..fb47a6c203 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -257,9 +257,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 diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index a50829ed55..38e38cade4 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -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 diff --git a/include/configs/novena.h b/include/configs/novena.h index d11cdc3983..d58c95f652 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -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 diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h index e4986b0b18..e704bb49c3 100644 --- a/include/configs/odroid_xu3.h +++ b/include/configs/odroid_xu3.h @@ -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 diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 17d8a86b4f..276429e5c6 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -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 diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index 7e802e9901..b083d57dde 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -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 diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h index 09beb74240..85e46b45c5 100644 --- a/include/configs/omap5_uevm.h +++ b/include/configs/omap5_uevm.h @@ -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 diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h index 45c140d03c..3e66c195e1 100644 --- a/include/configs/pcm051.h +++ b/include/configs/pcm051.h @@ -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 diff --git a/include/configs/pengwyn.h b/include/configs/pengwyn.h index ec3fcba0a5..8977115da3 100644 --- a/include/configs/pengwyn.h +++ b/include/configs/pengwyn.h @@ -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 diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index 919c60ea5b..e22818e0e0 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -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 diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h index ed5365ac76..25aedc233b 100644 --- a/include/configs/s5pc210_universal.h +++ b/include/configs/s5pc210_universal.h @@ -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 diff --git a/include/configs/sama5d2_xplained.h b/include/configs/sama5d2_xplained.h index 1225aa846b..427fed9379 100644 --- a/include/configs/sama5d2_xplained.h +++ b/include/configs/sama5d2_xplained.h @@ -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" diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h index ed6bafb486..25675026c5 100644 --- a/include/configs/sama5d3xek.h +++ b/include/configs/sama5d3xek.h @@ -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" diff --git a/include/configs/sama5d4_xplained.h b/include/configs/sama5d4_xplained.h index d89609b830..e310ee302b 100644 --- a/include/configs/sama5d4_xplained.h +++ b/include/configs/sama5d4_xplained.h @@ -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" diff --git a/include/configs/sama5d4ek.h b/include/configs/sama5d4ek.h index 3981c2363b..8af3033088 100644 --- a/include/configs/sama5d4ek.h +++ b/include/configs/sama5d4ek.h @@ -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" diff --git a/include/configs/sansa_fuze_plus.h b/include/configs/sansa_fuze_plus.h index 8088359e4d..c8f45428e1 100644 --- a/include/configs/sansa_fuze_plus.h +++ b/include/configs/sansa_fuze_plus.h @@ -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 diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index df4e734573..3dbe3439d2 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -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 diff --git a/include/configs/sniper.h b/include/configs/sniper.h index 12090a30e9..6c8b00ebbd 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -201,8 +201,6 @@ #define CONFIG_USB_MUSB_OMAP2PLUS #define CONFIG_TWL4030_USB -#define CONFIG_USB_GADGET_DUALSPEED - /* * Download */ diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index bdb06e7e53..8494486f30 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -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 diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index b5d05cd735..805ae09d40 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -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 diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index 715994c3fc..110c49445d 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -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 diff --git a/include/configs/tegra-common-usb-gadget.h b/include/configs/tegra-common-usb-gadget.h index ec034a1f87..45db9f1d20 100644 --- a/include/configs/tegra-common-usb-gadget.h +++ b/include/configs/tegra-common-usb-gadget.h @@ -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 diff --git a/include/configs/tseries.h b/include/configs/tseries.h index 901dfd726c..e73bc83e8c 100644 --- a/include/configs/tseries.h +++ b/include/configs/tseries.h @@ -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 diff --git a/include/configs/vinco.h b/include/configs/vinco.h index 5073b9cb56..69cb63f4d0 100644 --- a/include/configs/vinco.h +++ b/include/configs/vinco.h @@ -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" diff --git a/include/configs/warp.h b/include/configs/warp.h index 80c4e38259..4e3e2026c5 100644 --- a/include/configs/warp.h +++ b/include/configs/warp.h @@ -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 diff --git a/include/configs/xfi3.h b/include/configs/xfi3.h index aa49c9e7b5..83c18f05ba 100644 --- a/include/configs/xfi3.h +++ b/include/configs/xfi3.h @@ -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 diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 9493843464..c09b74631f 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -122,11 +122,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 diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index e4d1111f49..513b527643 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -98,8 +98,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 From aaa4a9e313ee6e5d30c1476ad754e0b907e34217 Mon Sep 17 00:00:00 2001 From: Sam Protsenko Date: Wed, 13 Apr 2016 14:20:26 +0300 Subject: [PATCH 5/9] usb: gadget: Move CONFIG_USB_GADGET_DOWNLOAD to Kconfig 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 --- 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(-) diff --git a/configs/A13-OLinuXino_defconfig b/configs/A13-OLinuXino_defconfig index 37ce92329b..e46efc6e76 100644 --- a/configs/A13-OLinuXino_defconfig +++ b/configs/A13-OLinuXino_defconfig @@ -22,3 +22,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2" CONFIG_USB_EHCI_HCD=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/CHIP_defconfig b/configs/CHIP_defconfig index 13a8f327bc..4fc1a31dc5 100644 --- a/configs/CHIP_defconfig +++ b/configs/CHIP_defconfig @@ -13,3 +13,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 diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig index 8c4fcf329e..2ec2928d71 100644 --- a/configs/Cubietruck_defconfig +++ b/configs/Cubietruck_defconfig @@ -19,3 +19,4 @@ CONFIG_ETH_DESIGNWARE=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig index 3562e5860b..c0c7468826 100644 --- a/configs/am335x_baltos_defconfig +++ b/configs/am335x_baltos_defconfig @@ -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 diff --git a/configs/am335x_boneblack_defconfig b/configs/am335x_boneblack_defconfig index 46ac47181a..8f781c833a 100644 --- a/configs/am335x_boneblack_defconfig +++ b/configs/am335x_boneblack_defconfig @@ -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 diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig index 8208b3cb95..8e252fff9a 100644 --- a/configs/am335x_boneblack_vboot_defconfig +++ b/configs/am335x_boneblack_vboot_defconfig @@ -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 diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig index b59ff810de..426ddc5d9f 100644 --- a/configs/am335x_evm_defconfig +++ b/configs/am335x_evm_defconfig @@ -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 diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig index 9458fd1c9e..264fe367ea 100644 --- a/configs/am335x_evm_nor_defconfig +++ b/configs/am335x_evm_nor_defconfig @@ -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 diff --git a/configs/am335x_evm_norboot_defconfig b/configs/am335x_evm_norboot_defconfig index 5a84150ebc..222fe82fb5 100644 --- a/configs/am335x_evm_norboot_defconfig +++ b/configs/am335x_evm_norboot_defconfig @@ -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 diff --git a/configs/am335x_evm_spiboot_defconfig b/configs/am335x_evm_spiboot_defconfig index c9e0761bf1..917128b784 100644 --- a/configs/am335x_evm_spiboot_defconfig +++ b/configs/am335x_evm_spiboot_defconfig @@ -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 diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig index e8b2b913e6..81b3d27650 100644 --- a/configs/am335x_evm_usbspl_defconfig +++ b/configs/am335x_evm_usbspl_defconfig @@ -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 diff --git a/configs/am335x_gp_evm_defconfig b/configs/am335x_gp_evm_defconfig index f888211b12..a06f7225ac 100644 --- a/configs/am335x_gp_evm_defconfig +++ b/configs/am335x_gp_evm_defconfig @@ -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 diff --git a/configs/am437x_gp_evm_defconfig b/configs/am437x_gp_evm_defconfig index e628bd4074..b02f8ad396 100644 --- a/configs/am437x_gp_evm_defconfig +++ b/configs/am437x_gp_evm_defconfig @@ -23,3 +23,4 @@ CONFIG_OMAP_TIMER=y CONFIG_USB=y CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/am437x_sk_evm_defconfig b/configs/am437x_sk_evm_defconfig index d556a7fe95..1960429f75 100644 --- a/configs/am437x_sk_evm_defconfig +++ b/configs/am437x_sk_evm_defconfig @@ -27,3 +27,4 @@ CONFIG_OMAP_TIMER=y CONFIG_USB=y CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig index 9b746bfe1e..942a6a0eb0 100644 --- a/configs/am43xx_evm_defconfig +++ b/configs/am43xx_evm_defconfig @@ -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 diff --git a/configs/am43xx_evm_ethboot_defconfig b/configs/am43xx_evm_ethboot_defconfig index 30a344cbd9..114d10f9b4 100644 --- a/configs/am43xx_evm_ethboot_defconfig +++ b/configs/am43xx_evm_ethboot_defconfig @@ -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 diff --git a/configs/am43xx_evm_qspiboot_defconfig b/configs/am43xx_evm_qspiboot_defconfig index 75c75dc783..52265c340b 100644 --- a/configs/am43xx_evm_qspiboot_defconfig +++ b/configs/am43xx_evm_qspiboot_defconfig @@ -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 diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig index 9c2234f956..9166848863 100644 --- a/configs/am43xx_evm_usbhost_boot_defconfig +++ b/configs/am43xx_evm_usbhost_boot_defconfig @@ -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 diff --git a/configs/apalis_t30_defconfig b/configs/apalis_t30_defconfig index a8b4621f91..882a21e8d9 100644 --- a/configs/apalis_t30_defconfig +++ b/configs/apalis_t30_defconfig @@ -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 diff --git a/configs/bcm11130_defconfig b/configs/bcm11130_defconfig index 11d20c0014..74a2881f80 100644 --- a/configs/bcm11130_defconfig +++ b/configs/bcm11130_defconfig @@ -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 diff --git a/configs/bcm11130_nand_defconfig b/configs/bcm11130_nand_defconfig index b7336b4ba1..9c66669200 100644 --- a/configs/bcm11130_nand_defconfig +++ b/configs/bcm11130_nand_defconfig @@ -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 diff --git a/configs/bcm28155_ap_defconfig b/configs/bcm28155_ap_defconfig index 15d3b8f3be..50a6a30d59 100644 --- a/configs/bcm28155_ap_defconfig +++ b/configs/bcm28155_ap_defconfig @@ -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 diff --git a/configs/bcm28155_w1d_defconfig b/configs/bcm28155_w1d_defconfig index d06130ce2b..cd6a1904c9 100644 --- a/configs/bcm28155_w1d_defconfig +++ b/configs/bcm28155_w1d_defconfig @@ -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 diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig index 1ab24bd277..04ecab9e8c 100644 --- a/configs/beaver_defconfig +++ b/configs/beaver_defconfig @@ -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 diff --git a/configs/birdland_bav335a_defconfig b/configs/birdland_bav335a_defconfig index 807c945f95..d9a58ada9a 100644 --- a/configs/birdland_bav335a_defconfig +++ b/configs/birdland_bav335a_defconfig @@ -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 diff --git a/configs/birdland_bav335b_defconfig b/configs/birdland_bav335b_defconfig index f923cfd835..e605ac63bb 100644 --- a/configs/birdland_bav335b_defconfig +++ b/configs/birdland_bav335b_defconfig @@ -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 diff --git a/configs/cgtqmx6eval_defconfig b/configs/cgtqmx6eval_defconfig index c7347257ea..d21e3e91eb 100644 --- a/configs/cgtqmx6eval_defconfig +++ b/configs/cgtqmx6eval_defconfig @@ -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 diff --git a/configs/colibri_t20_defconfig b/configs/colibri_t20_defconfig index 6f93f1cd2f..30d8b2bfa1 100644 --- a/configs/colibri_t20_defconfig +++ b/configs/colibri_t20_defconfig @@ -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 diff --git a/configs/colibri_t30_defconfig b/configs/colibri_t30_defconfig index 74f90db83e..81258a7d4b 100644 --- a/configs/colibri_t30_defconfig +++ b/configs/colibri_t30_defconfig @@ -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 diff --git a/configs/colibri_vf_defconfig b/configs/colibri_vf_defconfig index ccba59bad6..ba6ee38c4b 100644 --- a/configs/colibri_vf_defconfig +++ b/configs/colibri_vf_defconfig @@ -20,3 +20,4 @@ CONFIG_FSL_DSPI=y CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/corvus_defconfig b/configs/corvus_defconfig index 9f38c37d4e..534a31b67f 100644 --- a/configs/corvus_defconfig +++ b/configs/corvus_defconfig @@ -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 diff --git a/configs/dalmore_defconfig b/configs/dalmore_defconfig index 5b54e75ef8..ccfc6ba3ce 100644 --- a/configs/dalmore_defconfig +++ b/configs/dalmore_defconfig @@ -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 diff --git a/configs/dra72_evm_defconfig b/configs/dra72_evm_defconfig index 47fb0d7160..b2276a90c0 100644 --- a/configs/dra72_evm_defconfig +++ b/configs/dra72_evm_defconfig @@ -26,3 +26,4 @@ CONFIG_OMAP_TIMER=y CONFIG_USB=y CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/dra74_evm_defconfig b/configs/dra74_evm_defconfig index a15b65b3e3..7aa823334e 100644 --- a/configs/dra74_evm_defconfig +++ b/configs/dra74_evm_defconfig @@ -25,3 +25,4 @@ CONFIG_OMAP_TIMER=y CONFIG_USB=y CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig index 2d504a59b9..160ce933a5 100644 --- a/configs/dra7xx_evm_defconfig +++ b/configs/dra7xx_evm_defconfig @@ -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 diff --git a/configs/dra7xx_evm_qspiboot_defconfig b/configs/dra7xx_evm_qspiboot_defconfig index 6af9619942..4b4fd272c9 100644 --- a/configs/dra7xx_evm_qspiboot_defconfig +++ b/configs/dra7xx_evm_qspiboot_defconfig @@ -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 diff --git a/configs/dra7xx_evm_uart3_defconfig b/configs/dra7xx_evm_uart3_defconfig index 80ae9dd007..c86cedc37b 100644 --- a/configs/dra7xx_evm_uart3_defconfig +++ b/configs/dra7xx_evm_uart3_defconfig @@ -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 diff --git a/configs/draco_defconfig b/configs/draco_defconfig index be3ec0a525..48ae025750 100644 --- a/configs/draco_defconfig +++ b/configs/draco_defconfig @@ -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 diff --git a/configs/e2220-1170_defconfig b/configs/e2220-1170_defconfig index e0790aba45..845e6d3c74 100644 --- a/configs/e2220-1170_defconfig +++ b/configs/e2220-1170_defconfig @@ -19,3 +19,4 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/gwventana_defconfig b/configs/gwventana_defconfig index 5228c845b5..0afc696408 100644 --- a/configs/gwventana_defconfig +++ b/configs/gwventana_defconfig @@ -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 diff --git a/configs/jetson-tk1_defconfig b/configs/jetson-tk1_defconfig index 3078386448..eefe971202 100644 --- a/configs/jetson-tk1_defconfig +++ b/configs/jetson-tk1_defconfig @@ -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 diff --git a/configs/kc1_defconfig b/configs/kc1_defconfig index 06698b8b65..351da874d4 100644 --- a/configs/kc1_defconfig +++ b/configs/kc1_defconfig @@ -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 diff --git a/configs/mx6dlsabreauto_defconfig b/configs/mx6dlsabreauto_defconfig index 27ace9086d..350ca682ca 100644 --- a/configs/mx6dlsabreauto_defconfig +++ b/configs/mx6dlsabreauto_defconfig @@ -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 diff --git a/configs/mx6dlsabresd_defconfig b/configs/mx6dlsabresd_defconfig index d085ef78b1..4f467531af 100644 --- a/configs/mx6dlsabresd_defconfig +++ b/configs/mx6dlsabresd_defconfig @@ -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 diff --git a/configs/mx6qpsabreauto_defconfig b/configs/mx6qpsabreauto_defconfig index 4273a3283a..47843f160a 100644 --- a/configs/mx6qpsabreauto_defconfig +++ b/configs/mx6qpsabreauto_defconfig @@ -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 diff --git a/configs/mx6qsabreauto_defconfig b/configs/mx6qsabreauto_defconfig index 60262cd3c3..f719673e08 100644 --- a/configs/mx6qsabreauto_defconfig +++ b/configs/mx6qsabreauto_defconfig @@ -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 diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig index 917362af13..d6f76cc43a 100644 --- a/configs/mx6qsabrelite_defconfig +++ b/configs/mx6qsabrelite_defconfig @@ -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 diff --git a/configs/mx6qsabresd_defconfig b/configs/mx6qsabresd_defconfig index 333eb6721f..6d6afd847d 100644 --- a/configs/mx6qsabresd_defconfig +++ b/configs/mx6qsabresd_defconfig @@ -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 diff --git a/configs/mx6sabresd_spl_defconfig b/configs/mx6sabresd_spl_defconfig index 2e0363fef6..078a362147 100644 --- a/configs/mx6sabresd_spl_defconfig +++ b/configs/mx6sabresd_spl_defconfig @@ -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 diff --git a/configs/mx7dsabresd_defconfig b/configs/mx7dsabresd_defconfig index d106d8985e..4e4252db73 100644 --- a/configs/mx7dsabresd_defconfig +++ b/configs/mx7dsabresd_defconfig @@ -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 diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig index 7ba591a30b..338911a6f8 100644 --- a/configs/nitrogen6dl2g_defconfig +++ b/configs/nitrogen6dl2g_defconfig @@ -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 diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig index 3b46fb6e43..0c38e9214e 100644 --- a/configs/nitrogen6dl_defconfig +++ b/configs/nitrogen6dl_defconfig @@ -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 diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig index 6049891c93..710fdef82c 100644 --- a/configs/nitrogen6q2g_defconfig +++ b/configs/nitrogen6q2g_defconfig @@ -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 diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig index ce5b61fd00..0563ff3db6 100644 --- a/configs/nitrogen6q_defconfig +++ b/configs/nitrogen6q_defconfig @@ -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 diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig index 2e264f29eb..56c4b152f2 100644 --- a/configs/nitrogen6s1g_defconfig +++ b/configs/nitrogen6s1g_defconfig @@ -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 diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig index 39b381f8e2..0229eaa1d9 100644 --- a/configs/nitrogen6s_defconfig +++ b/configs/nitrogen6s_defconfig @@ -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 diff --git a/configs/nyan-big_defconfig b/configs/nyan-big_defconfig index dc965cc1bb..8ce1c2f4ab 100644 --- a/configs/nyan-big_defconfig +++ b/configs/nyan-big_defconfig @@ -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 diff --git a/configs/odroid-xu3_defconfig b/configs/odroid-xu3_defconfig index 4548cf0496..da92b2d165 100644 --- a/configs/odroid-xu3_defconfig +++ b/configs/odroid-xu3_defconfig @@ -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 diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig index dbdbf96666..2aea8c6db7 100644 --- a/configs/odroid_defconfig +++ b/configs/odroid_defconfig @@ -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 diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig index ab3cac448c..fdce13c88b 100644 --- a/configs/omap3_beagle_defconfig +++ b/configs/omap3_beagle_defconfig @@ -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 diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig index fefe209e97..ccb968622d 100644 --- a/configs/omap3_logic_defconfig +++ b/configs/omap3_logic_defconfig @@ -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 diff --git a/configs/omap5_uevm_defconfig b/configs/omap5_uevm_defconfig index 3fc75df353..024de72230 100644 --- a/configs/omap5_uevm_defconfig +++ b/configs/omap5_uevm_defconfig @@ -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 diff --git a/configs/origen_defconfig b/configs/origen_defconfig index 2ce71d46bc..17141fdb29 100644 --- a/configs/origen_defconfig +++ b/configs/origen_defconfig @@ -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 diff --git a/configs/p2371-0000_defconfig b/configs/p2371-0000_defconfig index 4cff742136..d258c7c53d 100644 --- a/configs/p2371-0000_defconfig +++ b/configs/p2371-0000_defconfig @@ -20,3 +20,4 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/p2371-2180_defconfig b/configs/p2371-2180_defconfig index cd0d325f9a..26765d6f75 100644 --- a/configs/p2371-2180_defconfig +++ b/configs/p2371-2180_defconfig @@ -22,3 +22,4 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/p2571_defconfig b/configs/p2571_defconfig index 65d788a625..68abec1825 100644 --- a/configs/p2571_defconfig +++ b/configs/p2571_defconfig @@ -20,3 +20,4 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig index 13e27b5453..f27478413b 100644 --- a/configs/pxm2_defconfig +++ b/configs/pxm2_defconfig @@ -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 diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig index 6f92d841a0..508ee47dc7 100644 --- a/configs/rastaban_defconfig +++ b/configs/rastaban_defconfig @@ -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 diff --git a/configs/rut_defconfig b/configs/rut_defconfig index d9367b3c1a..0363980b83 100644 --- a/configs/rut_defconfig +++ b/configs/rut_defconfig @@ -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 diff --git a/configs/s5p_goni_defconfig b/configs/s5p_goni_defconfig index 89c11953bd..47cf3af8d4 100644 --- a/configs/s5p_goni_defconfig +++ b/configs/s5p_goni_defconfig @@ -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 diff --git a/configs/s5pc210_universal_defconfig b/configs/s5pc210_universal_defconfig index dfcf4b7262..9927012654 100644 --- a/configs/s5pc210_universal_defconfig +++ b/configs/s5pc210_universal_defconfig @@ -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 diff --git a/configs/smartweb_defconfig b/configs/smartweb_defconfig index 84ba329d02..6d254798b9 100644 --- a/configs/smartweb_defconfig +++ b/configs/smartweb_defconfig @@ -10,4 +10,5 @@ CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"\" to stop\ CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b" CONFIG_USB=y CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT=y diff --git a/configs/sniper_defconfig b/configs/sniper_defconfig index 313c48901b..6816d5a465 100644 --- a/configs/sniper_defconfig +++ b/configs/sniper_defconfig @@ -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 diff --git a/configs/socfpga_arria5_defconfig b/configs/socfpga_arria5_defconfig index 372b312b4f..fbf72660ac 100644 --- a/configs/socfpga_arria5_defconfig +++ b/configs/socfpga_arria5_defconfig @@ -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 diff --git a/configs/socfpga_cyclone5_defconfig b/configs/socfpga_cyclone5_defconfig index b4de001554..da323db5b0 100644 --- a/configs/socfpga_cyclone5_defconfig +++ b/configs/socfpga_cyclone5_defconfig @@ -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 diff --git a/configs/socfpga_de0_nano_soc_defconfig b/configs/socfpga_de0_nano_soc_defconfig index a03d161405..c5efba5b4e 100644 --- a/configs/socfpga_de0_nano_soc_defconfig +++ b/configs/socfpga_de0_nano_soc_defconfig @@ -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 diff --git a/configs/socfpga_mcvevk_defconfig b/configs/socfpga_mcvevk_defconfig index d5d5a5c007..f1ae006a29 100644 --- a/configs/socfpga_mcvevk_defconfig +++ b/configs/socfpga_mcvevk_defconfig @@ -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 diff --git a/configs/socfpga_sockit_defconfig b/configs/socfpga_sockit_defconfig index 52d1d18861..730d9fc631 100644 --- a/configs/socfpga_sockit_defconfig +++ b/configs/socfpga_sockit_defconfig @@ -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 diff --git a/configs/socfpga_socrates_defconfig b/configs/socfpga_socrates_defconfig index 902b4d2a48..1cf2ce0c5c 100644 --- a/configs/socfpga_socrates_defconfig +++ b/configs/socfpga_socrates_defconfig @@ -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 diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig index 8a6b337726..8cdbb89720 100644 --- a/configs/taurus_defconfig +++ b/configs/taurus_defconfig @@ -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 diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig index dc8be7665e..5dca48fd74 100644 --- a/configs/tbs2910_defconfig +++ b/configs/tbs2910_defconfig @@ -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 diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig index 95d516f23d..0fd57e6a53 100644 --- a/configs/thuban_defconfig +++ b/configs/thuban_defconfig @@ -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 diff --git a/configs/trats2_defconfig b/configs/trats2_defconfig index 60fbab973c..d7f8405081 100644 --- a/configs/trats2_defconfig +++ b/configs/trats2_defconfig @@ -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 diff --git a/configs/trats_defconfig b/configs/trats_defconfig index 079233abec..b5431e5722 100644 --- a/configs/trats_defconfig +++ b/configs/trats_defconfig @@ -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 diff --git a/configs/venice2_defconfig b/configs/venice2_defconfig index 49ff5330c9..0d20697b65 100644 --- a/configs/venice2_defconfig +++ b/configs/venice2_defconfig @@ -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 diff --git a/configs/warp_defconfig b/configs/warp_defconfig index c7d185cbdb..c51516c3d8 100644 --- a/configs/warp_defconfig +++ b/configs/warp_defconfig @@ -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 diff --git a/configs/xilinx_zynqmp_ep_defconfig b/configs/xilinx_zynqmp_ep_defconfig index 86d65dc8f1..81f59457e6 100644 --- a/configs/xilinx_zynqmp_ep_defconfig +++ b/configs/xilinx_zynqmp_ep_defconfig @@ -40,4 +40,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 diff --git a/configs/zynq_picozed_defconfig b/configs/zynq_picozed_defconfig index 28fbd26cd7..3bd6fca900 100644 --- a/configs/zynq_picozed_defconfig +++ b/configs/zynq_picozed_defconfig @@ -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 diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig index e561784360..81d211f942 100644 --- a/configs/zynq_zc702_defconfig +++ b/configs/zynq_zc702_defconfig @@ -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 diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig index d3a0f23628..75d510170e 100644 --- a/configs/zynq_zc706_defconfig +++ b/configs/zynq_zc706_defconfig @@ -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 diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig index 63512dd500..51b2788ce1 100644 --- a/configs/zynq_zed_defconfig +++ b/configs/zynq_zed_defconfig @@ -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 diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig index e397acbd5f..01ca5d210a 100644 --- a/configs/zynq_zybo_defconfig +++ b/configs/zynq_zybo_defconfig @@ -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 diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index 5838d6e8de..969873c928 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig @@ -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 diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index f0e13b81b5..cd78a0644f 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -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 diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 8bea4c26b7..3643489b18 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -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 diff --git a/include/configs/baltos.h b/include/configs/baltos.h index 8280e6034a..96a17dd141 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -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 diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index c223931355..b466d48e68 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -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 diff --git a/include/configs/bcm28155_ap.h b/include/configs/bcm28155_ap.h index b431781ac1..680ef1652f 100644 --- a/include/configs/bcm28155_ap.h +++ b/include/configs/bcm28155_ap.h @@ -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 */ diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h index db207b9e2d..403de8403a 100644 --- a/include/configs/cgtqmx6eval.h +++ b/include/configs/cgtqmx6eval.h @@ -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 diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 3652d6101b..74a3874ead 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -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 diff --git a/include/configs/corvus.h b/include/configs/corvus.h index 81ebda4fe2..0b28529b4a 100644 --- a/include/configs/corvus.h +++ b/include/configs/corvus.h @@ -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 diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index a230896396..70c25bf0e0 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -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 diff --git a/include/configs/exynos4-common.h b/include/configs/exynos4-common.h index 7973991af6..a0f4aa8790 100644 --- a/include/configs/exynos4-common.h +++ b/include/configs/exynos4-common.h @@ -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 diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 711777c28c..0921093056 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -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 diff --git a/include/configs/kc1.h b/include/configs/kc1.h index 6a487f29f3..ab4cbabd3d 100644 --- a/include/configs/kc1.h +++ b/include/configs/kc1.h @@ -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" diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index 249554c338..8d8612d7df 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -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 diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h index fb47a6c203..f62e1d4024 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -261,7 +261,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 diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index 38e38cade4..f906bf241b 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -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 diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h index e704bb49c3..7e91f61eee 100644 --- a/include/configs/odroid_xu3.h +++ b/include/configs/odroid_xu3.h @@ -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 diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 276429e5c6..aec835276b 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -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" diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index b083d57dde..9337b890f7 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -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" diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h index 85e46b45c5..8a98934020 100644 --- a/include/configs/omap5_uevm.h +++ b/include/configs/omap5_uevm.h @@ -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 diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index e22818e0e0..d101cf20f4 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -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 diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 3dbe3439d2..d630f043d4 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -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 diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index 0586aec791..bafa8e3d3a 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -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 diff --git a/include/configs/sniper.h b/include/configs/sniper.h index 6c8b00ebbd..e61b115430 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -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" diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 8494486f30..2da40f3320 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -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 diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 805ae09d40..6e880a7e03 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -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 diff --git a/include/configs/taurus.h b/include/configs/taurus.h index 0b04b3a697..422b7a1722 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -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 diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index 110c49445d..19f35bb600 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -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" diff --git a/include/configs/tegra-common-usb-gadget.h b/include/configs/tegra-common-usb-gadget.h index 45db9f1d20..6b1247c5e0 100644 --- a/include/configs/tegra-common-usb-gadget.h +++ b/include/configs/tegra-common-usb-gadget.h @@ -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 diff --git a/include/configs/warp.h b/include/configs/warp.h index 4e3e2026c5..11ebbeb79a 100644 --- a/include/configs/warp.h +++ b/include/configs/warp.h @@ -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 diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index c09b74631f..d572b814cb 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -124,8 +124,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 diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 513b527643..450d487b5b 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -98,7 +98,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 From 65403f3010ff71968197821ff693d960269785b1 Mon Sep 17 00:00:00 2001 From: Sam Protsenko Date: Wed, 13 Apr 2016 14:20:27 +0300 Subject: [PATCH 6/9] usb: dwc3: Move CONFIG_USB_DWC3_GADGET/HOST to Kconfig Description was borrowed from kernel dwc3 Kconfig. Signed-off-by: Sam Protsenko --- 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(-) diff --git a/configs/am437x_gp_evm_defconfig b/configs/am437x_gp_evm_defconfig index b02f8ad396..8dc905e4ad 100644 --- a/configs/am437x_gp_evm_defconfig +++ b/configs/am437x_gp_evm_defconfig @@ -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 diff --git a/configs/am437x_sk_evm_defconfig b/configs/am437x_sk_evm_defconfig index 1960429f75..33cc903a7e 100644 --- a/configs/am437x_sk_evm_defconfig +++ b/configs/am437x_sk_evm_defconfig @@ -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 diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig index 942a6a0eb0..5406bebf29 100644 --- a/configs/am43xx_evm_defconfig +++ b/configs/am43xx_evm_defconfig @@ -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 diff --git a/configs/am43xx_evm_ethboot_defconfig b/configs/am43xx_evm_ethboot_defconfig index 114d10f9b4..fa01c754dd 100644 --- a/configs/am43xx_evm_ethboot_defconfig +++ b/configs/am43xx_evm_ethboot_defconfig @@ -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 diff --git a/configs/am43xx_evm_qspiboot_defconfig b/configs/am43xx_evm_qspiboot_defconfig index 52265c340b..76d2e72c91 100644 --- a/configs/am43xx_evm_qspiboot_defconfig +++ b/configs/am43xx_evm_qspiboot_defconfig @@ -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 diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig index 9166848863..c437b3a02e 100644 --- a/configs/am43xx_evm_usbhost_boot_defconfig +++ b/configs/am43xx_evm_usbhost_boot_defconfig @@ -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 diff --git a/configs/dra72_evm_defconfig b/configs/dra72_evm_defconfig index b2276a90c0..9fdd842748 100644 --- a/configs/dra72_evm_defconfig +++ b/configs/dra72_evm_defconfig @@ -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 diff --git a/configs/dra74_evm_defconfig b/configs/dra74_evm_defconfig index 7aa823334e..810db5b5da 100644 --- a/configs/dra74_evm_defconfig +++ b/configs/dra74_evm_defconfig @@ -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 diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig index 160ce933a5..88bf379773 100644 --- a/configs/dra7xx_evm_defconfig +++ b/configs/dra7xx_evm_defconfig @@ -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 diff --git a/configs/dra7xx_evm_qspiboot_defconfig b/configs/dra7xx_evm_qspiboot_defconfig index 4b4fd272c9..80961f7636 100644 --- a/configs/dra7xx_evm_qspiboot_defconfig +++ b/configs/dra7xx_evm_qspiboot_defconfig @@ -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 diff --git a/configs/dra7xx_evm_uart3_defconfig b/configs/dra7xx_evm_uart3_defconfig index c86cedc37b..f1870839b5 100644 --- a/configs/dra7xx_evm_uart3_defconfig +++ b/configs/dra7xx_evm_uart3_defconfig @@ -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 diff --git a/configs/odroid-xu3_defconfig b/configs/odroid-xu3_defconfig index da92b2d165..cb6035b98b 100644 --- a/configs/odroid-xu3_defconfig +++ b/configs/odroid-xu3_defconfig @@ -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 diff --git a/configs/omap5_uevm_defconfig b/configs/omap5_uevm_defconfig index 024de72230..5ab2b9d1a8 100644 --- a/configs/omap5_uevm_defconfig +++ b/configs/omap5_uevm_defconfig @@ -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 diff --git a/configs/xilinx_zynqmp_ep_defconfig b/configs/xilinx_zynqmp_ep_defconfig index 81f59457e6..3bab31c8e8 100644 --- a/configs/xilinx_zynqmp_ep_defconfig +++ b/configs/xilinx_zynqmp_ep_defconfig @@ -39,6 +39,7 @@ CONFIG_DM_ETH=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 diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig index debc74baa1..c0251b1937 100644 --- a/drivers/usb/dwc3/Kconfig +++ b/drivers/usb/dwc3/Kconfig @@ -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 diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 3643489b18..5e0f65d58f 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -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 diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 70c25bf0e0..3fb97e8843 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -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 diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h index 7e91f61eee..57e20e7e3f 100644 --- a/include/configs/odroid_xu3.h +++ b/include/configs/odroid_xu3.h @@ -48,7 +48,6 @@ #define CONFIG_USB_EHCI_EXYNOS /* DWC3 */ -#define CONFIG_USB_DWC3_GADGET #define CONFIG_USB_DWC3_PHY_SAMSUNG /* Downloader */ diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h index 8a98934020..6853260fd2 100644 --- a/include/configs/omap5_uevm.h +++ b/include/configs/omap5_uevm.h @@ -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 diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index d572b814cb..63165df18c 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -122,8 +122,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 From c16bf621d5100a1f5c64becc82b5620810565f3e Mon Sep 17 00:00:00 2001 From: Sam Protsenko Date: Wed, 13 Apr 2016 14:20:28 +0300 Subject: [PATCH 7/9] usb: dwc3: Move CONFIG_USB_DWC3_OMAP to Kconfig Signed-off-by: Sam Protsenko --- 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(-) diff --git a/configs/am437x_gp_evm_defconfig b/configs/am437x_gp_evm_defconfig index 8dc905e4ad..ce16f93bc7 100644 --- a/configs/am437x_gp_evm_defconfig +++ b/configs/am437x_gp_evm_defconfig @@ -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 diff --git a/configs/am437x_sk_evm_defconfig b/configs/am437x_sk_evm_defconfig index 33cc903a7e..ee956a031a 100644 --- a/configs/am437x_sk_evm_defconfig +++ b/configs/am437x_sk_evm_defconfig @@ -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 diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig index 5406bebf29..0940351655 100644 --- a/configs/am43xx_evm_defconfig +++ b/configs/am43xx_evm_defconfig @@ -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 diff --git a/configs/am43xx_evm_ethboot_defconfig b/configs/am43xx_evm_ethboot_defconfig index fa01c754dd..dc25719f32 100644 --- a/configs/am43xx_evm_ethboot_defconfig +++ b/configs/am43xx_evm_ethboot_defconfig @@ -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 diff --git a/configs/am43xx_evm_qspiboot_defconfig b/configs/am43xx_evm_qspiboot_defconfig index 76d2e72c91..4cd48c3d58 100644 --- a/configs/am43xx_evm_qspiboot_defconfig +++ b/configs/am43xx_evm_qspiboot_defconfig @@ -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 diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig index c437b3a02e..6371d54d3b 100644 --- a/configs/am43xx_evm_usbhost_boot_defconfig +++ b/configs/am43xx_evm_usbhost_boot_defconfig @@ -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 diff --git a/configs/dra72_evm_defconfig b/configs/dra72_evm_defconfig index 9fdd842748..040412da04 100644 --- a/configs/dra72_evm_defconfig +++ b/configs/dra72_evm_defconfig @@ -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 diff --git a/configs/dra74_evm_defconfig b/configs/dra74_evm_defconfig index 810db5b5da..28646b09a5 100644 --- a/configs/dra74_evm_defconfig +++ b/configs/dra74_evm_defconfig @@ -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 diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig index 88bf379773..a460897510 100644 --- a/configs/dra7xx_evm_defconfig +++ b/configs/dra7xx_evm_defconfig @@ -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 diff --git a/configs/dra7xx_evm_qspiboot_defconfig b/configs/dra7xx_evm_qspiboot_defconfig index 80961f7636..56a596594e 100644 --- a/configs/dra7xx_evm_qspiboot_defconfig +++ b/configs/dra7xx_evm_qspiboot_defconfig @@ -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 diff --git a/configs/dra7xx_evm_uart3_defconfig b/configs/dra7xx_evm_uart3_defconfig index f1870839b5..1121289f9c 100644 --- a/configs/dra7xx_evm_uart3_defconfig +++ b/configs/dra7xx_evm_uart3_defconfig @@ -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 diff --git a/configs/omap5_uevm_defconfig b/configs/omap5_uevm_defconfig index 5ab2b9d1a8..9a5b91b2b4 100644 --- a/configs/omap5_uevm_defconfig +++ b/configs/omap5_uevm_defconfig @@ -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 diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig index c0251b1937..0bb862a60a 100644 --- a/drivers/usb/dwc3/Kconfig +++ b/drivers/usb/dwc3/Kconfig @@ -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 diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 5e0f65d58f..b330f1b51b 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -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 diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 3fb97e8843..118bf916b6 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -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 diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h index 6853260fd2..533ac7b120 100644 --- a/include/configs/omap5_uevm.h +++ b/include/configs/omap5_uevm.h @@ -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 From b142729d03d7295076f2c276da5694b46e511e89 Mon Sep 17 00:00:00 2001 From: Sam Protsenko Date: Wed, 13 Apr 2016 14:20:29 +0300 Subject: [PATCH 8/9] usb: dwc3: Move CONFIG_USB_DWC3_PHY_* to Kconfig Signed-off-by: Sam Protsenko --- 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(-) diff --git a/configs/am437x_gp_evm_defconfig b/configs/am437x_gp_evm_defconfig index ce16f93bc7..c1b26e0656 100644 --- a/configs/am437x_gp_evm_defconfig +++ b/configs/am437x_gp_evm_defconfig @@ -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 diff --git a/configs/am437x_sk_evm_defconfig b/configs/am437x_sk_evm_defconfig index ee956a031a..80ff4da5cc 100644 --- a/configs/am437x_sk_evm_defconfig +++ b/configs/am437x_sk_evm_defconfig @@ -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 diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig index 0940351655..97ea209d47 100644 --- a/configs/am43xx_evm_defconfig +++ b/configs/am43xx_evm_defconfig @@ -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 diff --git a/configs/am43xx_evm_ethboot_defconfig b/configs/am43xx_evm_ethboot_defconfig index dc25719f32..5963437912 100644 --- a/configs/am43xx_evm_ethboot_defconfig +++ b/configs/am43xx_evm_ethboot_defconfig @@ -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 diff --git a/configs/am43xx_evm_qspiboot_defconfig b/configs/am43xx_evm_qspiboot_defconfig index 4cd48c3d58..02ce1efc8a 100644 --- a/configs/am43xx_evm_qspiboot_defconfig +++ b/configs/am43xx_evm_qspiboot_defconfig @@ -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 diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig index 6371d54d3b..9ac5c99c9c 100644 --- a/configs/am43xx_evm_usbhost_boot_defconfig +++ b/configs/am43xx_evm_usbhost_boot_defconfig @@ -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 diff --git a/configs/dra72_evm_defconfig b/configs/dra72_evm_defconfig index 040412da04..1b8d2b9d32 100644 --- a/configs/dra72_evm_defconfig +++ b/configs/dra72_evm_defconfig @@ -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 diff --git a/configs/dra74_evm_defconfig b/configs/dra74_evm_defconfig index 28646b09a5..2abf81ecff 100644 --- a/configs/dra74_evm_defconfig +++ b/configs/dra74_evm_defconfig @@ -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 diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig index a460897510..4dc339c92b 100644 --- a/configs/dra7xx_evm_defconfig +++ b/configs/dra7xx_evm_defconfig @@ -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 diff --git a/configs/dra7xx_evm_qspiboot_defconfig b/configs/dra7xx_evm_qspiboot_defconfig index 56a596594e..828a862284 100644 --- a/configs/dra7xx_evm_qspiboot_defconfig +++ b/configs/dra7xx_evm_qspiboot_defconfig @@ -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 diff --git a/configs/dra7xx_evm_uart3_defconfig b/configs/dra7xx_evm_uart3_defconfig index 1121289f9c..c5ff5a9a7d 100644 --- a/configs/dra7xx_evm_uart3_defconfig +++ b/configs/dra7xx_evm_uart3_defconfig @@ -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 diff --git a/configs/odroid-xu3_defconfig b/configs/odroid-xu3_defconfig index cb6035b98b..32f6dec873 100644 --- a/configs/odroid-xu3_defconfig +++ b/configs/odroid-xu3_defconfig @@ -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 diff --git a/configs/omap5_uevm_defconfig b/configs/omap5_uevm_defconfig index 9a5b91b2b4..7fe4fe5356 100644 --- a/configs/omap5_uevm_defconfig +++ b/configs/omap5_uevm_defconfig @@ -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 diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig index 0bb862a60a..e93398fe7c 100644 --- a/drivers/usb/dwc3/Kconfig +++ b/drivers/usb/dwc3/Kconfig @@ -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 diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index b330f1b51b..7586019c0c 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -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 diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 118bf916b6..8d820f44c9 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -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 diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h index 57e20e7e3f..76131cd901 100644 --- a/include/configs/odroid_xu3.h +++ b/include/configs/odroid_xu3.h @@ -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 diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h index 533ac7b120..bf922120a5 100644 --- a/include/configs/omap5_uevm.h +++ b/include/configs/omap5_uevm.h @@ -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 From e6c0bc0643e5a4387fecbcf83080d0b796eb067c Mon Sep 17 00:00:00 2001 From: Sam Protsenko Date: Wed, 13 Apr 2016 14:20:30 +0300 Subject: [PATCH 9/9] usb: gadget Move: CONFIG_G_DNL_* to Kconfig And also reformat defconfigs using "make savedefconfig" rule. Signed-off-by: Sam Protsenko --- 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(-) diff --git a/configs/A13-OLinuXino_defconfig b/configs/A13-OLinuXino_defconfig index e46efc6e76..77a122875f 100644 --- a/configs/A13-OLinuXino_defconfig +++ b/configs/A13-OLinuXino_defconfig @@ -23,3 +23,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 diff --git a/configs/CHIP_defconfig b/configs/CHIP_defconfig index 4fc1a31dc5..5a38c19324 100644 --- a/configs/CHIP_defconfig +++ b/configs/CHIP_defconfig @@ -14,3 +14,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 diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig index 2ec2928d71..5a037a9be5 100644 --- a/configs/Cubietruck_defconfig +++ b/configs/Cubietruck_defconfig @@ -20,3 +20,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 diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig index c0c7468826..e43a121e3e 100644 --- a/configs/am335x_baltos_defconfig +++ b/configs/am335x_baltos_defconfig @@ -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 diff --git a/configs/am335x_boneblack_defconfig b/configs/am335x_boneblack_defconfig index 8f781c833a..d8e793f25e 100644 --- a/configs/am335x_boneblack_defconfig +++ b/configs/am335x_boneblack_defconfig @@ -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 diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig index 8e252fff9a..10d4311380 100644 --- a/configs/am335x_boneblack_vboot_defconfig +++ b/configs/am335x_boneblack_vboot_defconfig @@ -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 diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig index 426ddc5d9f..5ca0f24a00 100644 --- a/configs/am335x_evm_defconfig +++ b/configs/am335x_evm_defconfig @@ -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 diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig index 264fe367ea..bc84100688 100644 --- a/configs/am335x_evm_nor_defconfig +++ b/configs/am335x_evm_nor_defconfig @@ -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 diff --git a/configs/am335x_evm_norboot_defconfig b/configs/am335x_evm_norboot_defconfig index 222fe82fb5..4a724aa7c2 100644 --- a/configs/am335x_evm_norboot_defconfig +++ b/configs/am335x_evm_norboot_defconfig @@ -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 diff --git a/configs/am335x_evm_spiboot_defconfig b/configs/am335x_evm_spiboot_defconfig index 917128b784..542894168c 100644 --- a/configs/am335x_evm_spiboot_defconfig +++ b/configs/am335x_evm_spiboot_defconfig @@ -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 diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig index 81b3d27650..7f7a55d458 100644 --- a/configs/am335x_evm_usbspl_defconfig +++ b/configs/am335x_evm_usbspl_defconfig @@ -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 diff --git a/configs/am335x_gp_evm_defconfig b/configs/am335x_gp_evm_defconfig index a06f7225ac..1ee07c923a 100644 --- a/configs/am335x_gp_evm_defconfig +++ b/configs/am335x_gp_evm_defconfig @@ -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 diff --git a/configs/am437x_gp_evm_defconfig b/configs/am437x_gp_evm_defconfig index c1b26e0656..69f5ac71e6 100644 --- a/configs/am437x_gp_evm_defconfig +++ b/configs/am437x_gp_evm_defconfig @@ -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 diff --git a/configs/am437x_sk_evm_defconfig b/configs/am437x_sk_evm_defconfig index 80ff4da5cc..c7a9fbebc5 100644 --- a/configs/am437x_sk_evm_defconfig +++ b/configs/am437x_sk_evm_defconfig @@ -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 diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig index 97ea209d47..d6a1c3ce5f 100644 --- a/configs/am43xx_evm_defconfig +++ b/configs/am43xx_evm_defconfig @@ -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 diff --git a/configs/am43xx_evm_ethboot_defconfig b/configs/am43xx_evm_ethboot_defconfig index 5963437912..67a9d493f2 100644 --- a/configs/am43xx_evm_ethboot_defconfig +++ b/configs/am43xx_evm_ethboot_defconfig @@ -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 diff --git a/configs/am43xx_evm_qspiboot_defconfig b/configs/am43xx_evm_qspiboot_defconfig index 02ce1efc8a..2194b16b71 100644 --- a/configs/am43xx_evm_qspiboot_defconfig +++ b/configs/am43xx_evm_qspiboot_defconfig @@ -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 diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig index 9ac5c99c9c..6840453e88 100644 --- a/configs/am43xx_evm_usbhost_boot_defconfig +++ b/configs/am43xx_evm_usbhost_boot_defconfig @@ -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 diff --git a/configs/apalis_t30_defconfig b/configs/apalis_t30_defconfig index 882a21e8d9..0686129c03 100644 --- a/configs/apalis_t30_defconfig +++ b/configs/apalis_t30_defconfig @@ -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 diff --git a/configs/bcm11130_defconfig b/configs/bcm11130_defconfig index 74a2881f80..a1fc989bb2 100644 --- a/configs/bcm11130_defconfig +++ b/configs/bcm11130_defconfig @@ -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 diff --git a/configs/bcm11130_nand_defconfig b/configs/bcm11130_nand_defconfig index 9c66669200..a49b3dc633 100644 --- a/configs/bcm11130_nand_defconfig +++ b/configs/bcm11130_nand_defconfig @@ -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 diff --git a/configs/bcm28155_ap_defconfig b/configs/bcm28155_ap_defconfig index 50a6a30d59..8076c4f2fe 100644 --- a/configs/bcm28155_ap_defconfig +++ b/configs/bcm28155_ap_defconfig @@ -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 diff --git a/configs/bcm28155_w1d_defconfig b/configs/bcm28155_w1d_defconfig index cd6a1904c9..25c8ff65d9 100644 --- a/configs/bcm28155_w1d_defconfig +++ b/configs/bcm28155_w1d_defconfig @@ -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 diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig index 04ecab9e8c..a67d8031fe 100644 --- a/configs/beaver_defconfig +++ b/configs/beaver_defconfig @@ -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 diff --git a/configs/birdland_bav335a_defconfig b/configs/birdland_bav335a_defconfig index d9a58ada9a..5828e2b10d 100644 --- a/configs/birdland_bav335a_defconfig +++ b/configs/birdland_bav335a_defconfig @@ -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 diff --git a/configs/birdland_bav335b_defconfig b/configs/birdland_bav335b_defconfig index e605ac63bb..bbefb55f9b 100644 --- a/configs/birdland_bav335b_defconfig +++ b/configs/birdland_bav335b_defconfig @@ -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 diff --git a/configs/cgtqmx6eval_defconfig b/configs/cgtqmx6eval_defconfig index d21e3e91eb..ad6f0934d2 100644 --- a/configs/cgtqmx6eval_defconfig +++ b/configs/cgtqmx6eval_defconfig @@ -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 diff --git a/configs/colibri_t20_defconfig b/configs/colibri_t20_defconfig index 30d8b2bfa1..57e0eb5224 100644 --- a/configs/colibri_t20_defconfig +++ b/configs/colibri_t20_defconfig @@ -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 diff --git a/configs/colibri_t30_defconfig b/configs/colibri_t30_defconfig index 81258a7d4b..583de258e4 100644 --- a/configs/colibri_t30_defconfig +++ b/configs/colibri_t30_defconfig @@ -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 diff --git a/configs/colibri_vf_defconfig b/configs/colibri_vf_defconfig index ba6ee38c4b..5481f04f1f 100644 --- a/configs/colibri_vf_defconfig +++ b/configs/colibri_vf_defconfig @@ -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 diff --git a/configs/corvus_defconfig b/configs/corvus_defconfig index 534a31b67f..bae8a05cea 100644 --- a/configs/corvus_defconfig +++ b/configs/corvus_defconfig @@ -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 diff --git a/configs/dalmore_defconfig b/configs/dalmore_defconfig index ccfc6ba3ce..a1e2a730d0 100644 --- a/configs/dalmore_defconfig +++ b/configs/dalmore_defconfig @@ -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 diff --git a/configs/dra72_evm_defconfig b/configs/dra72_evm_defconfig index 1b8d2b9d32..0d63986803 100644 --- a/configs/dra72_evm_defconfig +++ b/configs/dra72_evm_defconfig @@ -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 diff --git a/configs/dra74_evm_defconfig b/configs/dra74_evm_defconfig index 2abf81ecff..8ce544e025 100644 --- a/configs/dra74_evm_defconfig +++ b/configs/dra74_evm_defconfig @@ -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 diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig index 4dc339c92b..1b1c0bec01 100644 --- a/configs/dra7xx_evm_defconfig +++ b/configs/dra7xx_evm_defconfig @@ -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 diff --git a/configs/dra7xx_evm_qspiboot_defconfig b/configs/dra7xx_evm_qspiboot_defconfig index 828a862284..01301884ae 100644 --- a/configs/dra7xx_evm_qspiboot_defconfig +++ b/configs/dra7xx_evm_qspiboot_defconfig @@ -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 diff --git a/configs/dra7xx_evm_uart3_defconfig b/configs/dra7xx_evm_uart3_defconfig index c5ff5a9a7d..ca8007753c 100644 --- a/configs/dra7xx_evm_uart3_defconfig +++ b/configs/dra7xx_evm_uart3_defconfig @@ -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 diff --git a/configs/draco_defconfig b/configs/draco_defconfig index 48ae025750..7c3f82855f 100644 --- a/configs/draco_defconfig +++ b/configs/draco_defconfig @@ -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 diff --git a/configs/e2220-1170_defconfig b/configs/e2220-1170_defconfig index 845e6d3c74..38c085a1c9 100644 --- a/configs/e2220-1170_defconfig +++ b/configs/e2220-1170_defconfig @@ -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 diff --git a/configs/gwventana_defconfig b/configs/gwventana_defconfig index 0afc696408..49ee27315e 100644 --- a/configs/gwventana_defconfig +++ b/configs/gwventana_defconfig @@ -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 diff --git a/configs/jetson-tk1_defconfig b/configs/jetson-tk1_defconfig index eefe971202..bf509c2035 100644 --- a/configs/jetson-tk1_defconfig +++ b/configs/jetson-tk1_defconfig @@ -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 diff --git a/configs/kc1_defconfig b/configs/kc1_defconfig index 351da874d4..a9643cf959 100644 --- a/configs/kc1_defconfig +++ b/configs/kc1_defconfig @@ -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 diff --git a/configs/mx6dlsabreauto_defconfig b/configs/mx6dlsabreauto_defconfig index 350ca682ca..561e886b53 100644 --- a/configs/mx6dlsabreauto_defconfig +++ b/configs/mx6dlsabreauto_defconfig @@ -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 diff --git a/configs/mx6dlsabresd_defconfig b/configs/mx6dlsabresd_defconfig index 4f467531af..870e403a1d 100644 --- a/configs/mx6dlsabresd_defconfig +++ b/configs/mx6dlsabresd_defconfig @@ -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 diff --git a/configs/mx6qpsabreauto_defconfig b/configs/mx6qpsabreauto_defconfig index 47843f160a..61f0a75ec8 100644 --- a/configs/mx6qpsabreauto_defconfig +++ b/configs/mx6qpsabreauto_defconfig @@ -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 diff --git a/configs/mx6qsabreauto_defconfig b/configs/mx6qsabreauto_defconfig index f719673e08..49aa619655 100644 --- a/configs/mx6qsabreauto_defconfig +++ b/configs/mx6qsabreauto_defconfig @@ -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 diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig index d6f76cc43a..84faa2fc5d 100644 --- a/configs/mx6qsabrelite_defconfig +++ b/configs/mx6qsabrelite_defconfig @@ -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 diff --git a/configs/mx6qsabresd_defconfig b/configs/mx6qsabresd_defconfig index 6d6afd847d..7b69de1425 100644 --- a/configs/mx6qsabresd_defconfig +++ b/configs/mx6qsabresd_defconfig @@ -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 diff --git a/configs/mx6sabresd_spl_defconfig b/configs/mx6sabresd_spl_defconfig index 078a362147..540a822ce4 100644 --- a/configs/mx6sabresd_spl_defconfig +++ b/configs/mx6sabresd_spl_defconfig @@ -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 diff --git a/configs/mx7dsabresd_defconfig b/configs/mx7dsabresd_defconfig index 4e4252db73..fe7e55df96 100644 --- a/configs/mx7dsabresd_defconfig +++ b/configs/mx7dsabresd_defconfig @@ -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 diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig index 338911a6f8..34ddff920d 100644 --- a/configs/nitrogen6dl2g_defconfig +++ b/configs/nitrogen6dl2g_defconfig @@ -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 diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig index 0c38e9214e..c2bea2e446 100644 --- a/configs/nitrogen6dl_defconfig +++ b/configs/nitrogen6dl_defconfig @@ -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 diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig index 710fdef82c..0ce35b01b4 100644 --- a/configs/nitrogen6q2g_defconfig +++ b/configs/nitrogen6q2g_defconfig @@ -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 diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig index 0563ff3db6..ef2f0e2c22 100644 --- a/configs/nitrogen6q_defconfig +++ b/configs/nitrogen6q_defconfig @@ -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 diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig index 56c4b152f2..0aac6306dd 100644 --- a/configs/nitrogen6s1g_defconfig +++ b/configs/nitrogen6s1g_defconfig @@ -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 diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig index 0229eaa1d9..d6280df534 100644 --- a/configs/nitrogen6s_defconfig +++ b/configs/nitrogen6s_defconfig @@ -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 diff --git a/configs/nyan-big_defconfig b/configs/nyan-big_defconfig index 8ce1c2f4ab..d86a55ca68 100644 --- a/configs/nyan-big_defconfig +++ b/configs/nyan-big_defconfig @@ -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 diff --git a/configs/odroid-xu3_defconfig b/configs/odroid-xu3_defconfig index 32f6dec873..bb0576a7fe 100644 --- a/configs/odroid-xu3_defconfig +++ b/configs/odroid-xu3_defconfig @@ -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 diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig index 2aea8c6db7..a92bbe184d 100644 --- a/configs/odroid_defconfig +++ b/configs/odroid_defconfig @@ -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 diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig index fdce13c88b..ab54570c67 100644 --- a/configs/omap3_beagle_defconfig +++ b/configs/omap3_beagle_defconfig @@ -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 diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig index ccb968622d..dfbd1805fe 100644 --- a/configs/omap3_logic_defconfig +++ b/configs/omap3_logic_defconfig @@ -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 diff --git a/configs/omap5_uevm_defconfig b/configs/omap5_uevm_defconfig index 7fe4fe5356..135c89dcb1 100644 --- a/configs/omap5_uevm_defconfig +++ b/configs/omap5_uevm_defconfig @@ -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 diff --git a/configs/origen_defconfig b/configs/origen_defconfig index 17141fdb29..de4a816c97 100644 --- a/configs/origen_defconfig +++ b/configs/origen_defconfig @@ -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 diff --git a/configs/p2371-0000_defconfig b/configs/p2371-0000_defconfig index d258c7c53d..c9f7be2b95 100644 --- a/configs/p2371-0000_defconfig +++ b/configs/p2371-0000_defconfig @@ -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 diff --git a/configs/p2371-2180_defconfig b/configs/p2371-2180_defconfig index 26765d6f75..086a294dc4 100644 --- a/configs/p2371-2180_defconfig +++ b/configs/p2371-2180_defconfig @@ -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 diff --git a/configs/p2571_defconfig b/configs/p2571_defconfig index 68abec1825..f7596a578f 100644 --- a/configs/p2571_defconfig +++ b/configs/p2571_defconfig @@ -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 diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig index f27478413b..7a53016fa1 100644 --- a/configs/pxm2_defconfig +++ b/configs/pxm2_defconfig @@ -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 diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig index 508ee47dc7..e3bb5aeece 100644 --- a/configs/rastaban_defconfig +++ b/configs/rastaban_defconfig @@ -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 diff --git a/configs/rut_defconfig b/configs/rut_defconfig index 0363980b83..035fd1e13b 100644 --- a/configs/rut_defconfig +++ b/configs/rut_defconfig @@ -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 diff --git a/configs/s5p_goni_defconfig b/configs/s5p_goni_defconfig index 47cf3af8d4..8c1438d09d 100644 --- a/configs/s5p_goni_defconfig +++ b/configs/s5p_goni_defconfig @@ -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 diff --git a/configs/s5pc210_universal_defconfig b/configs/s5pc210_universal_defconfig index 9927012654..d91b433bab 100644 --- a/configs/s5pc210_universal_defconfig +++ b/configs/s5pc210_universal_defconfig @@ -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 diff --git a/configs/smartweb_defconfig b/configs/smartweb_defconfig index 6d254798b9..ce514c2de3 100644 --- a/configs/smartweb_defconfig +++ b/configs/smartweb_defconfig @@ -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 diff --git a/configs/sniper_defconfig b/configs/sniper_defconfig index 6816d5a465..6a31771edd 100644 --- a/configs/sniper_defconfig +++ b/configs/sniper_defconfig @@ -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 diff --git a/configs/socfpga_arria5_defconfig b/configs/socfpga_arria5_defconfig index fbf72660ac..9c8671c8f4 100644 --- a/configs/socfpga_arria5_defconfig +++ b/configs/socfpga_arria5_defconfig @@ -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 diff --git a/configs/socfpga_cyclone5_defconfig b/configs/socfpga_cyclone5_defconfig index da323db5b0..b68b298f87 100644 --- a/configs/socfpga_cyclone5_defconfig +++ b/configs/socfpga_cyclone5_defconfig @@ -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 diff --git a/configs/socfpga_de0_nano_soc_defconfig b/configs/socfpga_de0_nano_soc_defconfig index c5efba5b4e..d813dc9287 100644 --- a/configs/socfpga_de0_nano_soc_defconfig +++ b/configs/socfpga_de0_nano_soc_defconfig @@ -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 diff --git a/configs/socfpga_mcvevk_defconfig b/configs/socfpga_mcvevk_defconfig index f1ae006a29..5fe6238a3a 100644 --- a/configs/socfpga_mcvevk_defconfig +++ b/configs/socfpga_mcvevk_defconfig @@ -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 diff --git a/configs/socfpga_sockit_defconfig b/configs/socfpga_sockit_defconfig index 730d9fc631..8894e09271 100644 --- a/configs/socfpga_sockit_defconfig +++ b/configs/socfpga_sockit_defconfig @@ -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 diff --git a/configs/socfpga_socrates_defconfig b/configs/socfpga_socrates_defconfig index 1cf2ce0c5c..562052c3f7 100644 --- a/configs/socfpga_socrates_defconfig +++ b/configs/socfpga_socrates_defconfig @@ -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 diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig index 8cdbb89720..b5ab8b4813 100644 --- a/configs/taurus_defconfig +++ b/configs/taurus_defconfig @@ -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 diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig index 5dca48fd74..9f6aa8d5c7 100644 --- a/configs/tbs2910_defconfig +++ b/configs/tbs2910_defconfig @@ -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 diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig index 0fd57e6a53..047dc69e16 100644 --- a/configs/thuban_defconfig +++ b/configs/thuban_defconfig @@ -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 diff --git a/configs/trats2_defconfig b/configs/trats2_defconfig index d7f8405081..14bdc6aac3 100644 --- a/configs/trats2_defconfig +++ b/configs/trats2_defconfig @@ -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 diff --git a/configs/trats_defconfig b/configs/trats_defconfig index b5431e5722..c3b82bb507 100644 --- a/configs/trats_defconfig +++ b/configs/trats_defconfig @@ -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 diff --git a/configs/venice2_defconfig b/configs/venice2_defconfig index 0d20697b65..75e7579c56 100644 --- a/configs/venice2_defconfig +++ b/configs/venice2_defconfig @@ -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 diff --git a/configs/warp_defconfig b/configs/warp_defconfig index c51516c3d8..b9e4648414 100644 --- a/configs/warp_defconfig +++ b/configs/warp_defconfig @@ -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 diff --git a/configs/xilinx_zynqmp_ep_defconfig b/configs/xilinx_zynqmp_ep_defconfig index 3bab31c8e8..834cc45690 100644 --- a/configs/xilinx_zynqmp_ep_defconfig +++ b/configs/xilinx_zynqmp_ep_defconfig @@ -42,4 +42,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 diff --git a/configs/zynq_picozed_defconfig b/configs/zynq_picozed_defconfig index 3bd6fca900..ffbc73d56c 100644 --- a/configs/zynq_picozed_defconfig +++ b/configs/zynq_picozed_defconfig @@ -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 diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig index 81d211f942..5d9136c983 100644 --- a/configs/zynq_zc702_defconfig +++ b/configs/zynq_zc702_defconfig @@ -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 diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig index 75d510170e..d7c1b9623d 100644 --- a/configs/zynq_zc706_defconfig +++ b/configs/zynq_zc706_defconfig @@ -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 diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig index 51b2788ce1..bc3af099cb 100644 --- a/configs/zynq_zed_defconfig +++ b/configs/zynq_zed_defconfig @@ -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 diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig index 01ca5d210a..1895f950c9 100644 --- a/configs/zynq_zybo_defconfig +++ b/configs/zynq_zybo_defconfig @@ -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 diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index 969873c928..a35a1c7760 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig @@ -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 diff --git a/drivers/usb/gadget/g_dnl.c b/drivers/usb/gadget/g_dnl.c index bd3aad927b..45a484c4b7 100644 --- a/drivers/usb/gadget/g_dnl.c +++ b/drivers/usb/gadget/g_dnl.c @@ -27,7 +27,7 @@ * CONFIG_G_DNL_VENDOR_NUM * CONFIG_G_DNL_PRODUCT_NUM * CONFIG_G_DNL_MANUFACTURER - * at e.g. ./include/configs/.h + * at e.g. ./configs/_defconfig */ #define STRING_MANUFACTURER 25 diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index cd78a0644f..1b1684d7bf 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -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 */ /* diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 7586019c0c..5d5ae5e03d 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -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 diff --git a/include/configs/baltos.h b/include/configs/baltos.h index 96a17dd141..48d0613a0b 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -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) diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index b466d48e68..2c0ec9df9f 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -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) diff --git a/include/configs/bcm28155_ap.h b/include/configs/bcm28155_ap.h index 680ef1652f..bd83aabea7 100644 --- a/include/configs/bcm28155_ap.h +++ b/include/configs/bcm28155_ap.h @@ -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 */ diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h index 403de8403a..1ac9dca672 100644 --- a/include/configs/cgtqmx6eval.h +++ b/include/configs/cgtqmx6eval.h @@ -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 diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 74a3874ead..227519f9e0 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -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 diff --git a/include/configs/corvus.h b/include/configs/corvus.h index 0b28529b4a..a5255558da 100644 --- a/include/configs/corvus.h +++ b/include/configs/corvus.h @@ -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 diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 8d820f44c9..d2d16a62e3 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -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 diff --git a/include/configs/exynos4-common.h b/include/configs/exynos4-common.h index a0f4aa8790..8522a7992f 100644 --- a/include/configs/exynos4-common.h +++ b/include/configs/exynos4-common.h @@ -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 */ diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 0921093056..747eafc240 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -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 diff --git a/include/configs/kc1.h b/include/configs/kc1.h index ab4cbabd3d..6cbafdd911 100644 --- a/include/configs/kc1.h +++ b/include/configs/kc1.h @@ -184,14 +184,6 @@ #define CONFIG_USB_MUSB_PIO_ONLY #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 */ diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index 8d8612d7df..87bbf2e00c 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -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 diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h index f62e1d4024..ad87b2491a 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -262,10 +262,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 diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index f906bf241b..cb249c0def 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -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 diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h index 76131cd901..e52d7ba04a 100644 --- a/include/configs/odroid_xu3.h +++ b/include/configs/odroid_xu3.h @@ -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 diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index aec835276b..3fa8d7e385 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -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 diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index 9337b890f7..0cb62e9057 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -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 diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h index bf922120a5..10b97a02dd 100644 --- a/include/configs/omap5_uevm.h +++ b/include/configs/omap5_uevm.h @@ -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 diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index d101cf20f4..8520423fe5 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -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" diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index d630f043d4..5b94fad107 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -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 diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index bafa8e3d3a..0352379c04 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -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 diff --git a/include/configs/sniper.h b/include/configs/sniper.h index e61b115430..2d82a66b09 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -201,14 +201,6 @@ #define CONFIG_USB_MUSB_OMAP2PLUS #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 */ diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 2da40f3320..0c94bac5a4 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -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 /* diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 6e880a7e03..9c6c9b63c7 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -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 diff --git a/include/configs/taurus.h b/include/configs/taurus.h index 422b7a1722..405ed72a69 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -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 diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index 19f35bb600..d0734a7246 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -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 diff --git a/include/configs/tegra-common-usb-gadget.h b/include/configs/tegra-common-usb-gadget.h index 6b1247c5e0..18851ca3d0 100644 --- a/include/configs/tegra-common-usb-gadget.h +++ b/include/configs/tegra-common-usb-gadget.h @@ -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 diff --git a/include/configs/warp.h b/include/configs/warp.h index 11ebbeb79a..4c3df1dec4 100644 --- a/include/configs/warp.h +++ b/include/configs/warp.h @@ -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 diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 63165df18c..980fcb2df5 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -126,9 +126,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 diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 450d487b5b..23b1b2df45 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -102,9 +102,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