[U-Boot] [PATCH 05/13] usb: gadget: Make g_dnl USB settings common
Łukasz Majewski
lukma at denx.de
Sat Sep 9 04:46:04 UTC 2017
Hi Maxime,
> The g_dnl USB settings for the vendor ID, product ID and manufacturer are
> actually common settings that can and should be shared by all the gadgets.
>
> Make them common by renaming them, and convert all the users.
Reviewed-by: Lukasz Majewski <lukma at denx.de>
>
> Signed-off-by: Maxime Ripard <maxime.ripard at free-electrons.com>
> ---
> board/samsung/common/gadget.c | 4 ++--
> board/siemens/common/factoryset.c | 4 ++--
> configs/A13-OLinuXino_defconfig | 6 +++---
> configs/A20-OLinuXino-Lime2-eMMC_defconfig | 6 +++---
> configs/A20-OLinuXino-Lime2_defconfig | 6 +++---
> configs/CHIP_defconfig | 6 +++---
> configs/CHIP_pro_defconfig | 6 +++---
> configs/Cubietruck_defconfig | 6 +++---
> configs/Nintendo_NES_Classic_Edition_defconfig | 6 +++---
> configs/Sinlinx_SinA33_defconfig | 6 +++---
> configs/am335x_baltos_defconfig | 6 +++---
> configs/am335x_boneblack_defconfig | 6 +++---
> configs/am335x_boneblack_vboot_defconfig | 6 +++---
> configs/am335x_evm_defconfig | 6 +++---
> configs/am335x_evm_nor_defconfig | 6 +++---
> configs/am335x_evm_norboot_defconfig | 6 +++---
> configs/am335x_evm_spiboot_defconfig | 6 +++---
> configs/am335x_evm_usbspl_defconfig | 6 +++---
> configs/am335x_hs_evm_defconfig | 6 +++---
> configs/am43xx_evm_defconfig | 6 +++---
> configs/am43xx_evm_ethboot_defconfig | 6 +++---
> configs/am43xx_evm_qspiboot_defconfig | 6 +++---
> configs/am43xx_evm_usbhost_boot_defconfig | 6 +++---
> configs/am43xx_hs_evm_defconfig | 6 +++---
> configs/am57xx_evm_defconfig | 6 +++---
> configs/am57xx_evm_nodt_defconfig | 6 +++---
> configs/am57xx_hs_evm_defconfig | 6 +++---
> configs/apalis-tk1_defconfig | 6 +++---
> configs/apalis_imx6_defconfig | 6 +++---
> configs/apalis_imx6_nospl_com_defconfig | 6 +++---
> configs/apalis_imx6_nospl_it_defconfig | 6 +++---
> configs/apalis_t30_defconfig | 6 +++---
> configs/bcm11130_defconfig | 6 +++---
> configs/bcm11130_nand_defconfig | 6 +++---
> configs/bcm23550_w1d_defconfig | 6 +++---
> configs/bcm28155_ap_defconfig | 6 +++---
> configs/bcm28155_w1d_defconfig | 6 +++---
> configs/beaver_defconfig | 6 +++---
> configs/birdland_bav335a_defconfig | 6 +++---
> configs/birdland_bav335b_defconfig | 6 +++---
> configs/cei-tk1-som_defconfig | 6 +++---
> configs/cgtqmx6eval_defconfig | 6 +++---
> configs/chromebit_mickey_defconfig | 6 +++---
> configs/chromebook_jerry_defconfig | 6 +++---
> configs/chromebook_minnie_defconfig | 6 +++---
> configs/colibri_imx6_defconfig | 6 +++---
> configs/colibri_imx6_nospl_defconfig | 6 +++---
> configs/colibri_imx7_defconfig | 6 +++---
> configs/colibri_t20_defconfig | 6 +++---
> configs/colibri_t30_defconfig | 6 +++---
> configs/colibri_vf_defconfig | 6 +++---
> configs/corvus_defconfig | 6 +++---
> configs/dalmore_defconfig | 6 +++---
> configs/dms-ba16-1g_defconfig | 6 +++---
> configs/dms-ba16_defconfig | 6 +++---
> configs/dra7xx_evm_defconfig | 6 +++---
> configs/dra7xx_hs_evm_defconfig | 6 +++---
> configs/draco_defconfig | 6 +++---
> configs/e2220-1170_defconfig | 6 +++---
> configs/edison_defconfig | 6 +++---
> configs/etamin_defconfig | 6 +++---
> configs/evb-rk3036_defconfig | 6 +++---
> configs/evb-rk3229_defconfig | 6 +++---
> configs/evb-rk3288_defconfig | 6 +++---
> configs/evb-rk3328_defconfig | 6 +++---
> configs/fennec-rk3288_defconfig | 6 +++---
> configs/firefly-rk3288_defconfig | 6 +++---
> configs/gwventana_emmc_defconfig | 6 +++---
> configs/gwventana_gw5904_defconfig | 6 +++---
> configs/gwventana_nand_defconfig | 6 +++---
> configs/jetson-tk1_defconfig | 6 +++---
> configs/kc1_defconfig | 6 +++---
> configs/kylin-rk3036_defconfig | 6 +++---
> configs/ma5d4evk_defconfig | 6 +++---
> configs/miqi-rk3288_defconfig | 6 +++---
> configs/mx6qsabrelite_defconfig | 6 +++---
> configs/mx6sabreauto_defconfig | 6 +++---
> configs/mx6sabresd_defconfig | 6 +++---
> configs/mx7dsabresd_defconfig | 6 +++---
> configs/mx7dsabresd_secure_defconfig | 6 +++---
> configs/nitrogen6dl2g_defconfig | 6 +++---
> configs/nitrogen6dl_defconfig | 6 +++---
> configs/nitrogen6q2g_defconfig | 6 +++---
> configs/nitrogen6q_defconfig | 6 +++---
> configs/nitrogen6s1g_defconfig | 6 +++---
> configs/nitrogen6s_defconfig | 6 +++---
> configs/nyan-big_defconfig | 6 +++---
> configs/odroid-xu3_defconfig | 6 +++---
> configs/odroid_defconfig | 6 +++---
> configs/omap3_beagle_defconfig | 6 +++---
> configs/omap3_evm_defconfig | 6 +++---
> configs/omap3_logic_defconfig | 6 +++---
> configs/omap5_uevm_defconfig | 6 +++---
> configs/opos6uldev_defconfig | 6 +++---
> configs/origen_defconfig | 6 +++---
> configs/p2371-0000_defconfig | 6 +++---
> configs/p2371-2180_defconfig | 6 +++---
> configs/p2571_defconfig | 6 +++---
> configs/parrot_r16_defconfig | 6 +++---
> configs/phycore-rk3288_defconfig | 6 +++---
> configs/pico-imx6ul_defconfig | 6 +++---
> configs/pico-imx7d_defconfig | 6 +++---
> configs/popmetal-rk3288_defconfig | 6 +++---
> configs/pxm2_defconfig | 6 +++---
> configs/rastaban_defconfig | 6 +++---
> configs/rock2_defconfig | 6 +++---
> configs/rut_defconfig | 6 +++---
> configs/s5p_goni_defconfig | 6 +++---
> configs/s5pc210_universal_defconfig | 6 +++---
> configs/smartweb_defconfig | 6 +++---
> configs/sniper_defconfig | 6 +++---
> configs/socfpga_arria5_defconfig | 6 +++---
> configs/socfpga_cyclone5_defconfig | 6 +++---
> configs/socfpga_de0_nano_soc_defconfig | 6 +++---
> configs/socfpga_de10_nano_defconfig | 6 +++---
> configs/socfpga_mcvevk_defconfig | 6 +++---
> configs/socfpga_sockit_defconfig | 6 +++---
> configs/socfpga_socrates_defconfig | 6 +++---
> configs/socfpga_vining_fpga_defconfig | 6 +++---
> configs/taurus_defconfig | 6 +++---
> configs/tbs2910_defconfig | 6 +++---
> configs/thuban_defconfig | 6 +++---
> configs/tinker-rk3288_defconfig | 6 +++---
> configs/topic_miami_defconfig | 6 +++---
> configs/topic_miamilite_defconfig | 6 +++---
> configs/topic_miamiplus_defconfig | 6 +++---
> configs/trats2_defconfig | 6 +++---
> configs/trats_defconfig | 6 +++---
> configs/venice2_defconfig | 6 +++---
> configs/warp7_defconfig | 6 +++---
> configs/warp7_secure_defconfig | 6 +++---
> configs/warp_defconfig | 6 +++---
> configs/xilinx_zynqmp_ep_defconfig | 6 +++---
> configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 6 +++---
> configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 6 +++---
> configs/xilinx_zynqmp_zcu102_revA_defconfig | 6 +++---
> configs/xilinx_zynqmp_zcu102_revB_defconfig | 6 +++---
> configs/zynq_microzed_defconfig | 6 +++---
> configs/zynq_picozed_defconfig | 6 +++---
> configs/zynq_z_turn_defconfig | 6 +++---
> configs/zynq_zc702_defconfig | 6 +++---
> configs/zynq_zc706_defconfig | 6 +++---
> configs/zynq_zed_defconfig | 6 +++---
> configs/zynq_zybo_defconfig | 6 +++---
> doc/README.android-fastboot | 8 ++++----
> drivers/usb/gadget/Kconfig | 18 ++++++++---------
> drivers/usb/gadget/g_dnl.c | 12 +++++------
> include/configs/am43xx_evm.h | 6 +++---
> include/configs/odroid_xu3.h | 2 +-
> 149 files changed, 453 insertions(+), 453 deletions(-)
>
> diff --git a/board/samsung/common/gadget.c b/board/samsung/common/gadget.c
> index 6a1e57f1645c..ef732befc44e 100644
> --- a/board/samsung/common/gadget.c
> +++ b/board/samsung/common/gadget.c
> @@ -17,8 +17,8 @@ int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name)
> put_unaligned(CONFIG_G_DNL_UMS_VENDOR_NUM, &dev->idVendor);
> put_unaligned(CONFIG_G_DNL_UMS_PRODUCT_NUM, &dev->idProduct);
> } else {
> - put_unaligned(CONFIG_G_DNL_VENDOR_NUM, &dev->idVendor);
> - put_unaligned(CONFIG_G_DNL_PRODUCT_NUM, &dev->idProduct);
> + put_unaligned(CONFIG_USB_GADGET_VENDOR_NUM, &dev->idVendor);
> + put_unaligned(CONFIG_USB_GADGET_PRODUCT_NUM, &dev->idProduct);
> }
> return 0;
> }
> diff --git a/board/siemens/common/factoryset.c b/board/siemens/common/factoryset.c
> index b4f027af2862..81bbb5758d0b 100644
> --- a/board/siemens/common/factoryset.c
> +++ b/board/siemens/common/factoryset.c
> @@ -145,8 +145,8 @@ int factoryset_read_eeprom(int i2c_addr)
> unsigned char *cp, *cp1;
>
> #if defined(CONFIG_USB_FUNCTION_DFU)
> - factory_dat.usb_vendor_id = CONFIG_G_DNL_VENDOR_NUM;
> - factory_dat.usb_product_id = CONFIG_G_DNL_PRODUCT_NUM;
> + factory_dat.usb_vendor_id = CONFIG_USB_GADGET_VENDOR_NUM;
> + factory_dat.usb_product_id = CONFIG_USB_GADGET_PRODUCT_NUM;
> #endif
> if (i2c_probe(i2c_addr))
> goto err;
> diff --git a/configs/A13-OLinuXino_defconfig b/configs/A13-OLinuXino_defconfig
> index fbacce07cf0c..2574018d8213 100644
> --- a/configs/A13-OLinuXino_defconfig
> +++ b/configs/A13-OLinuXino_defconfig
> @@ -32,7 +32,7 @@ CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x1010
> 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/A20-OLinuXino-Lime2-eMMC_defconfig b/configs/A20-OLinuXino-Lime2-eMMC_defconfig
> index 58aa988b2363..5663a824e71b 100644
> --- a/configs/A20-OLinuXino-Lime2-eMMC_defconfig
> +++ b/configs/A20-OLinuXino-Lime2-eMMC_defconfig
> @@ -34,7 +34,7 @@ CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x1010
> 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/A20-OLinuXino-Lime2_defconfig b/configs/A20-OLinuXino-Lime2_defconfig
> index 6d7c58861373..63d013293690 100644
> --- a/configs/A20-OLinuXino-Lime2_defconfig
> +++ b/configs/A20-OLinuXino-Lime2_defconfig
> @@ -33,7 +33,7 @@ CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x1010
> 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 83228bd10f05..278039c05573 100644
> --- a/configs/CHIP_defconfig
> +++ b/configs/CHIP_defconfig
> @@ -23,8 +23,8 @@ CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x1010
> CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="Allwinner Technology"
> -CONFIG_G_DNL_VENDOR_NUM=0x1f3a
> -CONFIG_G_DNL_PRODUCT_NUM=0x1010
> CONFIG_OF_LIBFDT_OVERLAY=y
> diff --git a/configs/CHIP_pro_defconfig b/configs/CHIP_pro_defconfig
> index 3a748fc27e07..edbdefc69ddf 100644
> --- a/configs/CHIP_pro_defconfig
> +++ b/configs/CHIP_pro_defconfig
> @@ -28,8 +28,8 @@ CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x1010
> CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="Allwinner Technology"
> -CONFIG_G_DNL_VENDOR_NUM=0x1f3a
> -CONFIG_G_DNL_PRODUCT_NUM=0x1010
> CONFIG_OF_LIBFDT_OVERLAY=y
> diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig
> index f93ff0d6c463..2d1753645b0f 100644
> --- a/configs/Cubietruck_defconfig
> +++ b/configs/Cubietruck_defconfig
> @@ -33,7 +33,7 @@ CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x1010
> 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/Nintendo_NES_Classic_Edition_defconfig b/configs/Nintendo_NES_Classic_Edition_defconfig
> index d05375d0dbd5..99f7d30f150d 100644
> --- a/configs/Nintendo_NES_Classic_Edition_defconfig
> +++ b/configs/Nintendo_NES_Classic_Edition_defconfig
> @@ -23,7 +23,7 @@ CONFIG_AXP_ELDO2_VOLT=1800
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x1010
> 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/Sinlinx_SinA33_defconfig b/configs/Sinlinx_SinA33_defconfig
> index af00e5434763..8c5fc7587909 100644
> --- a/configs/Sinlinx_SinA33_defconfig
> +++ b/configs/Sinlinx_SinA33_defconfig
> @@ -28,7 +28,7 @@ CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x1010
> 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 2f075091b27a..efcbc523749c 100644
> --- a/configs/am335x_baltos_defconfig
> +++ b/configs/am335x_baltos_defconfig
> @@ -59,10 +59,10 @@ CONFIG_USB_MUSB_HOST=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0403
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xbd00
> CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
> -CONFIG_G_DNL_VENDOR_NUM=0x0403
> -CONFIG_G_DNL_PRODUCT_NUM=0xbd00
> CONFIG_USB_ETHER=y
> CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
> CONFIG_FAT_WRITE=y
> diff --git a/configs/am335x_boneblack_defconfig b/configs/am335x_boneblack_defconfig
> index a3dd9b03b538..85f220329e4e 100644
> --- a/configs/am335x_boneblack_defconfig
> +++ b/configs/am335x_boneblack_defconfig
> @@ -38,10 +38,10 @@ CONFIG_USB_MUSB_HOST=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0451
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
> CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
> -CONFIG_G_DNL_VENDOR_NUM=0x0451
> -CONFIG_G_DNL_PRODUCT_NUM=0xd022
> CONFIG_USB_ETHER=y
> CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
> CONFIG_LZO=y
> diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig
> index 7d52382c24dc..9ba3f7c04d73 100644
> --- a/configs/am335x_boneblack_vboot_defconfig
> +++ b/configs/am335x_boneblack_vboot_defconfig
> @@ -48,9 +48,9 @@ CONFIG_USB_MUSB_HOST=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0451
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
> CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
> -CONFIG_G_DNL_VENDOR_NUM=0x0451
> -CONFIG_G_DNL_PRODUCT_NUM=0xd022
> CONFIG_USB_ETHER=y
> CONFIG_LZO=y
> diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig
> index 69b2cf3e1f61..8aa3c0de8824 100644
> --- a/configs/am335x_evm_defconfig
> +++ b/configs/am335x_evm_defconfig
> @@ -50,10 +50,10 @@ CONFIG_USB_MUSB_GADGET=y
> CONFIG_USB_MUSB_TI=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0451
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
> CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
> -CONFIG_G_DNL_VENDOR_NUM=0x0451
> -CONFIG_G_DNL_PRODUCT_NUM=0xd022
> CONFIG_USB_ETHER=y
> CONFIG_RSA=y
> CONFIG_LZO=y
> diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig
> index 708df4284093..b745f2997334 100644
> --- a/configs/am335x_evm_nor_defconfig
> +++ b/configs/am335x_evm_nor_defconfig
> @@ -37,10 +37,10 @@ CONFIG_USB_MUSB_HOST=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0451
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
> CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
> -CONFIG_G_DNL_VENDOR_NUM=0x0451
> -CONFIG_G_DNL_PRODUCT_NUM=0xd022
> CONFIG_USB_ETHER=y
> CONFIG_LZO=y
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/am335x_evm_norboot_defconfig b/configs/am335x_evm_norboot_defconfig
> index 3f6f2798adce..9662b6684c1f 100644
> --- a/configs/am335x_evm_norboot_defconfig
> +++ b/configs/am335x_evm_norboot_defconfig
> @@ -31,10 +31,10 @@ CONFIG_USB_MUSB_HOST=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0451
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
> CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
> -CONFIG_G_DNL_VENDOR_NUM=0x0451
> -CONFIG_G_DNL_PRODUCT_NUM=0xd022
> CONFIG_USB_ETHER=y
> CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
> CONFIG_LZO=y
> diff --git a/configs/am335x_evm_spiboot_defconfig b/configs/am335x_evm_spiboot_defconfig
> index 427ca371815c..5e2c19066daa 100644
> --- a/configs/am335x_evm_spiboot_defconfig
> +++ b/configs/am335x_evm_spiboot_defconfig
> @@ -35,10 +35,10 @@ CONFIG_USB_MUSB_HOST=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0451
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
> CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
> -CONFIG_G_DNL_VENDOR_NUM=0x0451
> -CONFIG_G_DNL_PRODUCT_NUM=0xd022
> CONFIG_USB_ETHER=y
> CONFIG_LZO=y
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig
> index a4e9e8f1b27b..d6c21b8e85ee 100644
> --- a/configs/am335x_evm_usbspl_defconfig
> +++ b/configs/am335x_evm_usbspl_defconfig
> @@ -41,10 +41,10 @@ CONFIG_USB_MUSB_HOST=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0451
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
> CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
> -CONFIG_G_DNL_VENDOR_NUM=0x0451
> -CONFIG_G_DNL_PRODUCT_NUM=0xd022
> CONFIG_USB_ETHER=y
> CONFIG_LZO=y
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/am335x_hs_evm_defconfig b/configs/am335x_hs_evm_defconfig
> index 552150732398..683c102d0f1f 100644
> --- a/configs/am335x_hs_evm_defconfig
> +++ b/configs/am335x_hs_evm_defconfig
> @@ -54,10 +54,10 @@ CONFIG_USB_MUSB_GADGET=y
> CONFIG_USB_MUSB_TI=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0451
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
> CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
> -CONFIG_G_DNL_VENDOR_NUM=0x0451
> -CONFIG_G_DNL_PRODUCT_NUM=0xd022
> CONFIG_USB_ETHER=y
> CONFIG_RSA=y
> CONFIG_LZO=y
> diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig
> index 15c25d39f1ae..ce5d0eb29142 100644
> --- a/configs/am43xx_evm_defconfig
> +++ b/configs/am43xx_evm_defconfig
> @@ -52,7 +52,7 @@ CONFIG_USB_DWC3_OMAP=y
> CONFIG_USB_DWC3_PHY_OMAP=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0403
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xbd00
> 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_ethboot_defconfig b/configs/am43xx_evm_ethboot_defconfig
> index 6c170888680c..7bcec25af36f 100644
> --- a/configs/am43xx_evm_ethboot_defconfig
> +++ b/configs/am43xx_evm_ethboot_defconfig
> @@ -61,8 +61,8 @@ CONFIG_USB_DWC3_OMAP=y
> CONFIG_USB_DWC3_PHY_OMAP=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0403
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xbd00
> 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 fde41c5c7e1c..e72d435cfe06 100644
> --- a/configs/am43xx_evm_qspiboot_defconfig
> +++ b/configs/am43xx_evm_qspiboot_defconfig
> @@ -52,9 +52,9 @@ CONFIG_USB_DWC3_OMAP=y
> CONFIG_USB_DWC3_PHY_OMAP=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0403
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xbd00
> CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
> -CONFIG_G_DNL_VENDOR_NUM=0x0403
> -CONFIG_G_DNL_PRODUCT_NUM=0xbd00
> CONFIG_FAT_WRITE=y
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig
> index 0bed33572297..8109f98b4b7c 100644
> --- a/configs/am43xx_evm_usbhost_boot_defconfig
> +++ b/configs/am43xx_evm_usbhost_boot_defconfig
> @@ -75,7 +75,7 @@ CONFIG_USB_DWC3_OMAP=y
> CONFIG_USB_DWC3_PHY_OMAP=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0403
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xbd00
> 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_hs_evm_defconfig b/configs/am43xx_hs_evm_defconfig
> index a4d23e10b60e..da7dbfb02b9e 100644
> --- a/configs/am43xx_hs_evm_defconfig
> +++ b/configs/am43xx_hs_evm_defconfig
> @@ -63,7 +63,7 @@ CONFIG_USB_DWC3_OMAP=y
> CONFIG_USB_DWC3_PHY_OMAP=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0403
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xbd00
> 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/am57xx_evm_defconfig b/configs/am57xx_evm_defconfig
> index 3d455eb7d4e1..a9ee2e448f3c 100644
> --- a/configs/am57xx_evm_defconfig
> +++ b/configs/am57xx_evm_defconfig
> @@ -72,7 +72,7 @@ CONFIG_USB_DWC3_OMAP=y
> CONFIG_USB_DWC3_PHY_OMAP=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0451
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
> 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/am57xx_evm_nodt_defconfig b/configs/am57xx_evm_nodt_defconfig
> index f96348699bad..ae7c3464e0cb 100644
> --- a/configs/am57xx_evm_nodt_defconfig
> +++ b/configs/am57xx_evm_nodt_defconfig
> @@ -62,9 +62,9 @@ CONFIG_USB_DWC3_OMAP=y
> CONFIG_USB_DWC3_PHY_OMAP=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0451
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
> CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
> -CONFIG_G_DNL_VENDOR_NUM=0x0451
> -CONFIG_G_DNL_PRODUCT_NUM=0xd022
> CONFIG_FAT_WRITE=y
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/am57xx_hs_evm_defconfig b/configs/am57xx_hs_evm_defconfig
> index 01d77cbbd09e..1047f33237ef 100644
> --- a/configs/am57xx_hs_evm_defconfig
> +++ b/configs/am57xx_hs_evm_defconfig
> @@ -75,7 +75,7 @@ CONFIG_USB_DWC3_OMAP=y
> CONFIG_USB_DWC3_PHY_OMAP=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0451
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
> 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/apalis-tk1_defconfig b/configs/apalis-tk1_defconfig
> index e6e3a9bfe932..84e010649115 100644
> --- a/configs/apalis-tk1_defconfig
> +++ b/configs/apalis-tk1_defconfig
> @@ -47,9 +47,9 @@ CONFIG_DM_USB=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Toradex"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x1b67
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xffff
> 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=0xffff
> CONFIG_OF_LIBFDT_OVERLAY=y
> diff --git a/configs/apalis_imx6_defconfig b/configs/apalis_imx6_defconfig
> index 8f48cb2f27d9..f52bc0f4d2d6 100644
> --- a/configs/apalis_imx6_defconfig
> +++ b/configs/apalis_imx6_defconfig
> @@ -56,11 +56,11 @@ CONFIG_USB_STORAGE=y
> CONFIG_USB_KEYBOARD=y
> CONFIG_SYS_USB_EVENT_POLL=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Toradex"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x1b67
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x4000
> 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=0x4000
> CONFIG_FAT_WRITE=y
> CONFIG_OF_LIBFDT=y
> CONFIG_OF_LIBFDT_OVERLAY=y
> diff --git a/configs/apalis_imx6_nospl_com_defconfig b/configs/apalis_imx6_nospl_com_defconfig
> index 6d372b12f9eb..7c238c0d7ce2 100644
> --- a/configs/apalis_imx6_nospl_com_defconfig
> +++ b/configs/apalis_imx6_nospl_com_defconfig
> @@ -45,11 +45,11 @@ CONFIG_USB_STORAGE=y
> CONFIG_USB_KEYBOARD=y
> CONFIG_SYS_USB_EVENT_POLL=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Toradex"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x1b67
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x4020
> 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=0x4020
> CONFIG_FAT_WRITE=y
> CONFIG_OF_LIBFDT=y
> # CONFIG_EFI_LOADER is not set
> diff --git a/configs/apalis_imx6_nospl_it_defconfig b/configs/apalis_imx6_nospl_it_defconfig
> index cfcc50a4b9cd..fc3ff59bbc74 100644
> --- a/configs/apalis_imx6_nospl_it_defconfig
> +++ b/configs/apalis_imx6_nospl_it_defconfig
> @@ -45,11 +45,11 @@ CONFIG_USB_STORAGE=y
> CONFIG_USB_KEYBOARD=y
> CONFIG_SYS_USB_EVENT_POLL=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Toradex"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x1b67
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x4020
> 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=0x4020
> CONFIG_FAT_WRITE=y
> CONFIG_OF_LIBFDT=y
> # CONFIG_EFI_LOADER is not set
> diff --git a/configs/apalis_t30_defconfig b/configs/apalis_t30_defconfig
> index e15e11ad929a..588c1842a3d3 100644
> --- a/configs/apalis_t30_defconfig
> +++ b/configs/apalis_t30_defconfig
> @@ -40,9 +40,9 @@ CONFIG_DM_USB=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Toradex"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x1b67
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x4000
> 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=0x4000
> CONFIG_OF_LIBFDT_OVERLAY=y
> diff --git a/configs/bcm11130_defconfig b/configs/bcm11130_defconfig
> index cf3a7cd74d09..4d93975d69aa 100644
> --- a/configs/bcm11130_defconfig
> +++ b/configs/bcm11130_defconfig
> @@ -27,9 +27,9 @@ CONFIG_MMC_SDHCI_KONA=y
> CONFIG_SYS_NS16550=y
> CONFIG_USB=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Broadcom Corporation"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x18d1
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x0d02
> CONFIG_USB_GADGET_DWC2_OTG=y
> CONFIG_USB_GADGET_DWC2_OTG_PHY_BUS_WIDTH_8=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 2ce917981ecb..555ff0538216 100644
> --- a/configs/bcm11130_nand_defconfig
> +++ b/configs/bcm11130_nand_defconfig
> @@ -27,9 +27,9 @@ CONFIG_NAND=y
> CONFIG_SYS_NS16550=y
> CONFIG_USB=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Broadcom Corporation"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x18d1
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x0d02
> CONFIG_USB_GADGET_DWC2_OTG=y
> CONFIG_USB_GADGET_DWC2_OTG_PHY_BUS_WIDTH_8=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/bcm23550_w1d_defconfig b/configs/bcm23550_w1d_defconfig
> index 70918654f5ca..49f7e40d15d9 100644
> --- a/configs/bcm23550_w1d_defconfig
> +++ b/configs/bcm23550_w1d_defconfig
> @@ -34,11 +34,11 @@ CONFIG_MMC_SDHCI_KONA=y
> CONFIG_SYS_NS16550=y
> CONFIG_USB=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Broadcom Corporation"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x18d1
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x0d02
> CONFIG_USB_GADGET_BCM_UDC_OTG_PHY=y
> CONFIG_USB_GADGET_DWC2_OTG=y
> CONFIG_USB_GADGET_DWC2_OTG_PHY_BUS_WIDTH_8=y
> CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="Broadcom Corporation"
> -CONFIG_G_DNL_VENDOR_NUM=0x18d1
> -CONFIG_G_DNL_PRODUCT_NUM=0x0d02
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/bcm28155_ap_defconfig b/configs/bcm28155_ap_defconfig
> index db1ad401324f..9e17b60e54e4 100644
> --- a/configs/bcm28155_ap_defconfig
> +++ b/configs/bcm28155_ap_defconfig
> @@ -35,11 +35,11 @@ CONFIG_MMC_SDHCI_KONA=y
> CONFIG_SYS_NS16550=y
> CONFIG_USB=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Broadcom Corporation"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x18d1
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x0d02
> CONFIG_USB_GADGET_BCM_UDC_OTG_PHY=y
> CONFIG_USB_GADGET_DWC2_OTG=y
> CONFIG_USB_GADGET_DWC2_OTG_PHY_BUS_WIDTH_8=y
> CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="Broadcom Corporation"
> -CONFIG_G_DNL_VENDOR_NUM=0x18d1
> -CONFIG_G_DNL_PRODUCT_NUM=0x0d02
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/bcm28155_w1d_defconfig b/configs/bcm28155_w1d_defconfig
> index 3684fae37005..8f8668ba5b74 100644
> --- a/configs/bcm28155_w1d_defconfig
> +++ b/configs/bcm28155_w1d_defconfig
> @@ -29,9 +29,9 @@ CONFIG_BCM_SF2_ETH_GMAC=y
> CONFIG_SYS_NS16550=y
> CONFIG_USB=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Broadcom Corporation"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x18d1
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x0d02
> CONFIG_USB_GADGET_DWC2_OTG=y
> CONFIG_USB_GADGET_DWC2_OTG_PHY_BUS_WIDTH_8=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 a61fd628ca79..31af4bee493c 100644
> --- a/configs/beaver_defconfig
> +++ b/configs/beaver_defconfig
> @@ -45,8 +45,8 @@ CONFIG_DM_USB=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="NVIDIA"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0955
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x701a
> 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/birdland_bav335a_defconfig b/configs/birdland_bav335a_defconfig
> index 44f4eac6f63b..41b77302155f 100644
> --- a/configs/birdland_bav335a_defconfig
> +++ b/configs/birdland_bav335a_defconfig
> @@ -66,10 +66,10 @@ CONFIG_USB_MUSB_HOST=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0451
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
> CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
> -CONFIG_G_DNL_VENDOR_NUM=0x0451
> -CONFIG_G_DNL_PRODUCT_NUM=0xd022
> CONFIG_FAT_WRITE=y
> CONFIG_LZO=y
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/birdland_bav335b_defconfig b/configs/birdland_bav335b_defconfig
> index 1dffd1a1950d..6ecf8d035478 100644
> --- a/configs/birdland_bav335b_defconfig
> +++ b/configs/birdland_bav335b_defconfig
> @@ -66,10 +66,10 @@ CONFIG_USB_MUSB_HOST=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0451
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
> CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
> -CONFIG_G_DNL_VENDOR_NUM=0x0451
> -CONFIG_G_DNL_PRODUCT_NUM=0xd022
> CONFIG_FAT_WRITE=y
> CONFIG_LZO=y
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/cei-tk1-som_defconfig b/configs/cei-tk1-som_defconfig
> index 08cc1d0c5698..859b7b6a2e4c 100644
> --- a/configs/cei-tk1-som_defconfig
> +++ b/configs/cei-tk1-som_defconfig
> @@ -48,8 +48,8 @@ CONFIG_DM_USB=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="NVIDIA"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0955
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x701a
> 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/cgtqmx6eval_defconfig b/configs/cgtqmx6eval_defconfig
> index 18f2ff848b44..314d08d855da 100644
> --- a/configs/cgtqmx6eval_defconfig
> +++ b/configs/cgtqmx6eval_defconfig
> @@ -57,10 +57,10 @@ CONFIG_USB_STORAGE=y
> CONFIG_USB_KEYBOARD=y
> CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Congatec"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0525
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
> 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_VIDEO_SW_CURSOR is not set
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/chromebit_mickey_defconfig b/configs/chromebit_mickey_defconfig
> index f40c0b9afa7d..fccff80780bc 100644
> --- a/configs/chromebit_mickey_defconfig
> +++ b/configs/chromebit_mickey_defconfig
> @@ -75,11 +75,11 @@ CONFIG_ROCKCHIP_SPI=y
> CONFIG_SYSRESET=y
> CONFIG_USB=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x2207
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
> CONFIG_USB_GADGET_DWC2_OTG=y
> CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="Rockchip"
> -CONFIG_G_DNL_VENDOR_NUM=0x2207
> -CONFIG_G_DNL_PRODUCT_NUM=0x320a
> CONFIG_DM_VIDEO=y
> CONFIG_DISPLAY=y
> CONFIG_VIDEO_ROCKCHIP=y
> diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig
> index cdeabaa12aa6..18790b30898f 100644
> --- a/configs/chromebook_jerry_defconfig
> +++ b/configs/chromebook_jerry_defconfig
> @@ -76,11 +76,11 @@ CONFIG_ROCKCHIP_SPI=y
> CONFIG_SYSRESET=y
> CONFIG_USB=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x2207
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
> CONFIG_USB_GADGET_DWC2_OTG=y
> CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="Rockchip"
> -CONFIG_G_DNL_VENDOR_NUM=0x2207
> -CONFIG_G_DNL_PRODUCT_NUM=0x320a
> CONFIG_DM_VIDEO=y
> CONFIG_DISPLAY=y
> CONFIG_VIDEO_ROCKCHIP=y
> diff --git a/configs/chromebook_minnie_defconfig b/configs/chromebook_minnie_defconfig
> index c1e36fa8601d..fdb992d59252 100644
> --- a/configs/chromebook_minnie_defconfig
> +++ b/configs/chromebook_minnie_defconfig
> @@ -75,11 +75,11 @@ CONFIG_ROCKCHIP_SPI=y
> CONFIG_SYSRESET=y
> CONFIG_USB=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x2207
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
> CONFIG_USB_GADGET_DWC2_OTG=y
> CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="Rockchip"
> -CONFIG_G_DNL_VENDOR_NUM=0x2207
> -CONFIG_G_DNL_PRODUCT_NUM=0x320a
> CONFIG_DM_VIDEO=y
> CONFIG_DISPLAY=y
> CONFIG_VIDEO_ROCKCHIP=y
> diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig
> index 0c52de51faf2..0003123c8d00 100644
> --- a/configs/colibri_imx6_defconfig
> +++ b/configs/colibri_imx6_defconfig
> @@ -54,11 +54,11 @@ CONFIG_USB_STORAGE=y
> CONFIG_USB_KEYBOARD=y
> CONFIG_SYS_USB_EVENT_POLL=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Toradex"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x1b67
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x4000
> 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=0x4000
> CONFIG_FAT_WRITE=y
> CONFIG_OF_LIBFDT=y
> CONFIG_OF_LIBFDT_OVERLAY=y
> diff --git a/configs/colibri_imx6_nospl_defconfig b/configs/colibri_imx6_nospl_defconfig
> index 3eedff8a7d0b..c57ed720b115 100644
> --- a/configs/colibri_imx6_nospl_defconfig
> +++ b/configs/colibri_imx6_nospl_defconfig
> @@ -43,11 +43,11 @@ CONFIG_USB_STORAGE=y
> CONFIG_USB_KEYBOARD=y
> CONFIG_SYS_USB_EVENT_POLL=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Toradex"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x1b67
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x4000
> 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=0x4000
> CONFIG_FAT_WRITE=y
> CONFIG_OF_LIBFDT=y
> # CONFIG_EFI_LOADER is not set
> diff --git a/configs/colibri_imx7_defconfig b/configs/colibri_imx7_defconfig
> index d0b6c6814631..56ae86799140 100644
> --- a/configs/colibri_imx7_defconfig
> +++ b/configs/colibri_imx7_defconfig
> @@ -56,10 +56,10 @@ CONFIG_USB=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Toradex"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x1b67
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x4000
> 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=0x4000
> CONFIG_OF_LIBFDT_OVERLAY=y
> CONFIG_FDT_FIXUP_PARTITIONS=y
> diff --git a/configs/colibri_t20_defconfig b/configs/colibri_t20_defconfig
> index ce1cb1405248..98932f73ba13 100644
> --- a/configs/colibri_t20_defconfig
> +++ b/configs/colibri_t20_defconfig
> @@ -47,11 +47,11 @@ CONFIG_USB_ULPI_VIEWPORT=y
> CONFIG_USB_ULPI=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Toradex"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x1b67
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x4000
> 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=0x4000
> CONFIG_DM_VIDEO=y
> CONFIG_VIDEO_TEGRA20=y
> CONFIG_CONSOLE_SCROLL_LINES=10
> diff --git a/configs/colibri_t30_defconfig b/configs/colibri_t30_defconfig
> index 810359a22f25..6152fa8b79ee 100644
> --- a/configs/colibri_t30_defconfig
> +++ b/configs/colibri_t30_defconfig
> @@ -34,9 +34,9 @@ CONFIG_DM_USB=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Toradex"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x1b67
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x4000
> 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=0x4000
> CONFIG_OF_LIBFDT_OVERLAY=y
> diff --git a/configs/colibri_vf_defconfig b/configs/colibri_vf_defconfig
> index 1ffe86180974..c0d664ec2fcd 100644
> --- a/configs/colibri_vf_defconfig
> +++ b/configs/colibri_vf_defconfig
> @@ -53,11 +53,11 @@ CONFIG_DM_USB=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Toradex"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x1b67
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x4000
> 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=0x4000
> CONFIG_VIDEO_FSL_DCU_FB=y
> CONFIG_SYS_CONSOLE_FG_COL=0x00
> CONFIG_OF_LIBFDT_OVERLAY=y
> diff --git a/configs/corvus_defconfig b/configs/corvus_defconfig
> index 705e00145700..066dc38535d0 100644
> --- a/configs/corvus_defconfig
> +++ b/configs/corvus_defconfig
> @@ -49,9 +49,9 @@ CONFIG_USB=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0908
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x02d2
> 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_EFI_LOADER is not set
> diff --git a/configs/dalmore_defconfig b/configs/dalmore_defconfig
> index e2d4563e95cb..6c03b5287073 100644
> --- a/configs/dalmore_defconfig
> +++ b/configs/dalmore_defconfig
> @@ -39,8 +39,8 @@ CONFIG_DM_USB=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="NVIDIA"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0955
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x701a
> 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/dms-ba16-1g_defconfig b/configs/dms-ba16-1g_defconfig
> index 2342f34e7885..352ab04c8ba3 100644
> --- a/configs/dms-ba16-1g_defconfig
> +++ b/configs/dms-ba16-1g_defconfig
> @@ -38,10 +38,10 @@ CONFIG_USB_STORAGE=y
> CONFIG_USB_KEYBOARD=y
> CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Advantech"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0525
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
> CONFIG_CI_UDC=y
> CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="Advantech"
> -CONFIG_G_DNL_VENDOR_NUM=0x0525
> -CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
> # CONFIG_VIDEO_SW_CURSOR is not set
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/dms-ba16_defconfig b/configs/dms-ba16_defconfig
> index 08d96add3b93..8a38c8d8c4c9 100644
> --- a/configs/dms-ba16_defconfig
> +++ b/configs/dms-ba16_defconfig
> @@ -37,10 +37,10 @@ CONFIG_USB_STORAGE=y
> CONFIG_USB_KEYBOARD=y
> CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Advantech"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0525
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
> CONFIG_CI_UDC=y
> CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="Advantech"
> -CONFIG_G_DNL_VENDOR_NUM=0x0525
> -CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
> # CONFIG_VIDEO_SW_CURSOR is not set
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig
> index e4bb299275d9..4aca3a4a043a 100644
> --- a/configs/dra7xx_evm_defconfig
> +++ b/configs/dra7xx_evm_defconfig
> @@ -90,7 +90,7 @@ CONFIG_USB_DWC3_OMAP=y
> CONFIG_USB_DWC3_PHY_OMAP=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0451
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
> 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_hs_evm_defconfig b/configs/dra7xx_hs_evm_defconfig
> index f55fc501aa48..4d126e09f6a6 100644
> --- a/configs/dra7xx_hs_evm_defconfig
> +++ b/configs/dra7xx_hs_evm_defconfig
> @@ -92,7 +92,7 @@ CONFIG_USB_DWC3_OMAP=y
> CONFIG_USB_DWC3_PHY_OMAP=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0451
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
> 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/draco_defconfig b/configs/draco_defconfig
> index e38030bf5913..de2961bfb9c7 100644
> --- a/configs/draco_defconfig
> +++ b/configs/draco_defconfig
> @@ -66,8 +66,8 @@ CONFIG_USB_MUSB_HOST=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0908
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x02d2
> CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="Siemens AG"
> -CONFIG_G_DNL_VENDOR_NUM=0x0908
> -CONFIG_G_DNL_PRODUCT_NUM=0x02d2
> CONFIG_USB_ETHER=y
> diff --git a/configs/e2220-1170_defconfig b/configs/e2220-1170_defconfig
> index ff0a2a651ccc..b21043bd4c1c 100644
> --- a/configs/e2220-1170_defconfig
> +++ b/configs/e2220-1170_defconfig
> @@ -35,6 +35,6 @@ CONFIG_USB_STORAGE=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_USB_GADGET_MANUFACTURER="NVIDIA"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0955
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x701a
> diff --git a/configs/edison_defconfig b/configs/edison_defconfig
> index d099c0b0dcd0..fa955de8a015 100644
> --- a/configs/edison_defconfig
> +++ b/configs/edison_defconfig
> @@ -33,8 +33,8 @@ CONFIG_DM_PCI_COMPAT=y
> CONFIG_USB_DWC3_GADGET=y
> CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="Intel"
> -CONFIG_G_DNL_VENDOR_NUM=0x8087
> -CONFIG_G_DNL_PRODUCT_NUM=0x0a99
> +CONFIG_USB_GADGET_MANUFACTURER="Intel"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x8087
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x0a99
> CONFIG_FAT_WRITE=y
> CONFIG_SHA1=y
> diff --git a/configs/etamin_defconfig b/configs/etamin_defconfig
> index 33ca6858abfd..70559892b6e3 100644
> --- a/configs/etamin_defconfig
> +++ b/configs/etamin_defconfig
> @@ -66,8 +66,8 @@ CONFIG_USB_MUSB_HOST=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0908
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x02d2
> CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="Siemens AG"
> -CONFIG_G_DNL_VENDOR_NUM=0x0908
> -CONFIG_G_DNL_PRODUCT_NUM=0x02d2
> CONFIG_USB_ETHER=y
> diff --git a/configs/evb-rk3036_defconfig b/configs/evb-rk3036_defconfig
> index 5a53951314e2..9cce3351f80b 100644
> --- a/configs/evb-rk3036_defconfig
> +++ b/configs/evb-rk3036_defconfig
> @@ -44,11 +44,11 @@ CONFIG_DEBUG_UART_SHIFT=2
> CONFIG_SYSRESET=y
> CONFIG_USB=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x2207
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x310a
> CONFIG_USB_GADGET_DWC2_OTG=y
> CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="Rockchip"
> -CONFIG_G_DNL_VENDOR_NUM=0x2207
> -CONFIG_G_DNL_PRODUCT_NUM=0x310a
> CONFIG_SPL_TINY_MEMSET=y
> CONFIG_CMD_DHRYSTONE=y
> CONFIG_ERRNO_STR=y
> diff --git a/configs/evb-rk3229_defconfig b/configs/evb-rk3229_defconfig
> index 5a658a149522..61fdacaa1340 100644
> --- a/configs/evb-rk3229_defconfig
> +++ b/configs/evb-rk3229_defconfig
> @@ -44,9 +44,9 @@ CONFIG_SYS_NS16550=y
> CONFIG_SYSRESET=y
> CONFIG_USB=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x2207
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
> CONFIG_USB_GADGET_DWC2_OTG=y
> CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="Rockchip"
> -CONFIG_G_DNL_VENDOR_NUM=0x2207
> -CONFIG_G_DNL_PRODUCT_NUM=0x320a
> CONFIG_ERRNO_STR=y
> diff --git a/configs/evb-rk3288_defconfig b/configs/evb-rk3288_defconfig
> index 5294ba9f5feb..0d91cdd53ff6 100644
> --- a/configs/evb-rk3288_defconfig
> +++ b/configs/evb-rk3288_defconfig
> @@ -66,11 +66,11 @@ CONFIG_SYS_NS16550=y
> CONFIG_SYSRESET=y
> CONFIG_USB=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x2207
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
> CONFIG_USB_GADGET_DWC2_OTG=y
> CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="Rockchip"
> -CONFIG_G_DNL_VENDOR_NUM=0x2207
> -CONFIG_G_DNL_PRODUCT_NUM=0x320a
> CONFIG_DM_VIDEO=y
> CONFIG_DISPLAY=y
> CONFIG_VIDEO_ROCKCHIP=y
> diff --git a/configs/evb-rk3328_defconfig b/configs/evb-rk3328_defconfig
> index 7bec00178692..e3999556d8b2 100644
> --- a/configs/evb-rk3328_defconfig
> +++ b/configs/evb-rk3328_defconfig
> @@ -47,8 +47,8 @@ CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> CONFIG_USB_GADGET_DWC2_OTG=y
> CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="Rockchip"
> -CONFIG_G_DNL_VENDOR_NUM=0x2207
> -CONFIG_G_DNL_PRODUCT_NUM=0x330a
> +CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x2207
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x330a
> CONFIG_USE_TINY_PRINTF=y
> CONFIG_ERRNO_STR=y
> diff --git a/configs/fennec-rk3288_defconfig b/configs/fennec-rk3288_defconfig
> index e00b62db307f..21a9956020ca 100644
> --- a/configs/fennec-rk3288_defconfig
> +++ b/configs/fennec-rk3288_defconfig
> @@ -69,11 +69,11 @@ CONFIG_USB=y
> CONFIG_USB_DWC2=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x2207
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
> CONFIG_USB_GADGET_DWC2_OTG=y
> CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="Rockchip"
> -CONFIG_G_DNL_VENDOR_NUM=0x2207
> -CONFIG_G_DNL_PRODUCT_NUM=0x320a
> CONFIG_USE_TINY_PRINTF=y
> CONFIG_CMD_DHRYSTONE=y
> CONFIG_ERRNO_STR=y
> diff --git a/configs/firefly-rk3288_defconfig b/configs/firefly-rk3288_defconfig
> index 930d6d8dcbf1..122ad9c3a890 100644
> --- a/configs/firefly-rk3288_defconfig
> +++ b/configs/firefly-rk3288_defconfig
> @@ -75,11 +75,11 @@ CONFIG_USB_STORAGE=y
> CONFIG_USB_KEYBOARD=y
> CONFIG_SYS_USB_EVENT_POLL=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x2207
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
> CONFIG_USB_GADGET_DWC2_OTG=y
> CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="Rockchip"
> -CONFIG_G_DNL_VENDOR_NUM=0x2207
> -CONFIG_G_DNL_PRODUCT_NUM=0x320a
> CONFIG_DM_VIDEO=y
> CONFIG_DISPLAY=y
> CONFIG_VIDEO_ROCKCHIP=y
> diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig
> index 17ca9c9af46e..d775339049e9 100644
> --- a/configs/gwventana_emmc_defconfig
> +++ b/configs/gwventana_emmc_defconfig
> @@ -63,11 +63,11 @@ CONFIG_USB_STORAGE=y
> CONFIG_USB_KEYBOARD=y
> CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Gateworks"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0525
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
> 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_USB_ETHER=y
> CONFIG_USB_ETH_CDC=y
> # CONFIG_VIDEO_SW_CURSOR is not set
> diff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig
> index 906bac282139..a69efb8b6e6b 100644
> --- a/configs/gwventana_gw5904_defconfig
> +++ b/configs/gwventana_gw5904_defconfig
> @@ -67,11 +67,11 @@ CONFIG_USB_STORAGE=y
> CONFIG_USB_KEYBOARD=y
> CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Gateworks"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0525
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
> 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_USB_ETHER=y
> CONFIG_USB_ETH_CDC=y
> # CONFIG_VIDEO_SW_CURSOR is not set
> diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig
> index 05fb98c62ce8..2548bb746351 100644
> --- a/configs/gwventana_nand_defconfig
> +++ b/configs/gwventana_nand_defconfig
> @@ -66,11 +66,11 @@ CONFIG_USB_STORAGE=y
> CONFIG_USB_KEYBOARD=y
> CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Gateworks"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0525
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
> 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_USB_ETHER=y
> CONFIG_USB_ETH_CDC=y
> # CONFIG_VIDEO_SW_CURSOR is not set
> diff --git a/configs/jetson-tk1_defconfig b/configs/jetson-tk1_defconfig
> index b3d860c700fb..5ece9f26b7a0 100644
> --- a/configs/jetson-tk1_defconfig
> +++ b/configs/jetson-tk1_defconfig
> @@ -49,8 +49,8 @@ CONFIG_DM_USB=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="NVIDIA"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0955
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x701a
> 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/kc1_defconfig b/configs/kc1_defconfig
> index d9c2efcf7cbe..d27a7f5abbe0 100644
> --- a/configs/kc1_defconfig
> +++ b/configs/kc1_defconfig
> @@ -42,8 +42,8 @@ CONFIG_SYS_NS16550=y
> CONFIG_USB=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0451
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
> 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/kylin-rk3036_defconfig b/configs/kylin-rk3036_defconfig
> index ab36b48db751..8eb1bc2c8b95 100644
> --- a/configs/kylin-rk3036_defconfig
> +++ b/configs/kylin-rk3036_defconfig
> @@ -44,11 +44,11 @@ CONFIG_USB=y
> CONFIG_USB_DWC2=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x2207
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x310a
> CONFIG_USB_GADGET_DWC2_OTG=y
> CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="Rockchip"
> -CONFIG_G_DNL_VENDOR_NUM=0x2207
> -CONFIG_G_DNL_PRODUCT_NUM=0x310a
> CONFIG_SPL_TINY_MEMSET=y
> CONFIG_CMD_DHRYSTONE=y
> CONFIG_ERRNO_STR=y
> diff --git a/configs/ma5d4evk_defconfig b/configs/ma5d4evk_defconfig
> index 0655505a1321..43ab70416331 100644
> --- a/configs/ma5d4evk_defconfig
> +++ b/configs/ma5d4evk_defconfig
> @@ -47,11 +47,11 @@ CONFIG_USB=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="AriesEmbedded"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0525
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
> CONFIG_USB_GADGET_ATMEL_USBA=y
> CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="AriesEmbedded"
> -CONFIG_G_DNL_VENDOR_NUM=0x0525
> -CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
> CONFIG_USB_ETHER=y
> CONFIG_FAT_WRITE=y
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/miqi-rk3288_defconfig b/configs/miqi-rk3288_defconfig
> index b669c8cb3227..c01d420035e5 100644
> --- a/configs/miqi-rk3288_defconfig
> +++ b/configs/miqi-rk3288_defconfig
> @@ -69,11 +69,11 @@ CONFIG_USB=y
> CONFIG_USB_DWC2=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x2207
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
> CONFIG_USB_GADGET_DWC2_OTG=y
> CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="Rockchip"
> -CONFIG_G_DNL_VENDOR_NUM=0x2207
> -CONFIG_G_DNL_PRODUCT_NUM=0x320a
> CONFIG_DM_VIDEO=y
> CONFIG_DISPLAY=y
> CONFIG_VIDEO_ROCKCHIP=y
> diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig
> index f716c8fd7f77..92e0a578dfde 100644
> --- a/configs/mx6qsabrelite_defconfig
> +++ b/configs/mx6qsabrelite_defconfig
> @@ -49,11 +49,11 @@ CONFIG_USB_STORAGE=y
> CONFIG_USB_KEYBOARD=y
> CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Boundary"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0525
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
> 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_USB_ETHER=y
> CONFIG_USB_ETH_CDC=y
> # CONFIG_VIDEO_SW_CURSOR is not set
> diff --git a/configs/mx6sabreauto_defconfig b/configs/mx6sabreauto_defconfig
> index 50f2a05c2c97..a4e41d1b9bb5 100644
> --- a/configs/mx6sabreauto_defconfig
> +++ b/configs/mx6sabreauto_defconfig
> @@ -48,10 +48,10 @@ CONFIG_PHYLIB=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="FSL"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0525
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
> 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_VIDEO_SW_CURSOR is not set
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/mx6sabresd_defconfig b/configs/mx6sabresd_defconfig
> index 422dd2803e22..fcde31a6efe1 100644
> --- a/configs/mx6sabresd_defconfig
> +++ b/configs/mx6sabresd_defconfig
> @@ -48,10 +48,10 @@ CONFIG_PCI=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="FSL"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0525
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
> 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_VIDEO_SW_CURSOR is not set
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/mx7dsabresd_defconfig b/configs/mx7dsabresd_defconfig
> index 8f2e33adc868..f11eed41dd9c 100644
> --- a/configs/mx7dsabresd_defconfig
> +++ b/configs/mx7dsabresd_defconfig
> @@ -64,9 +64,9 @@ CONFIG_USB_EHCI_HCD=y
> CONFIG_MXC_USB_OTG_HACTIVE=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="FSL"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0525
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
> 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_ERRNO_STR=y
> diff --git a/configs/mx7dsabresd_secure_defconfig b/configs/mx7dsabresd_secure_defconfig
> index bba933f250b9..3c0146daf76c 100644
> --- a/configs/mx7dsabresd_secure_defconfig
> +++ b/configs/mx7dsabresd_secure_defconfig
> @@ -66,9 +66,9 @@ CONFIG_USB_EHCI_HCD=y
> CONFIG_MXC_USB_OTG_HACTIVE=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="FSL"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0525
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
> 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_ERRNO_STR=y
> diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig
> index fd4a46558129..a5fdb48d2452 100644
> --- a/configs/nitrogen6dl2g_defconfig
> +++ b/configs/nitrogen6dl2g_defconfig
> @@ -46,11 +46,11 @@ CONFIG_USB_STORAGE=y
> CONFIG_USB_KEYBOARD=y
> CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Boundary"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0525
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
> 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_USB_ETHER=y
> CONFIG_USB_ETH_CDC=y
> # CONFIG_VIDEO_SW_CURSOR is not set
> diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig
> index 30046e3f3a07..1803bdba888e 100644
> --- a/configs/nitrogen6dl_defconfig
> +++ b/configs/nitrogen6dl_defconfig
> @@ -46,11 +46,11 @@ CONFIG_USB_STORAGE=y
> CONFIG_USB_KEYBOARD=y
> CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Boundary"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0525
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
> 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_USB_ETHER=y
> CONFIG_USB_ETH_CDC=y
> # CONFIG_VIDEO_SW_CURSOR is not set
> diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig
> index f9160c208fe7..3c9b44023f82 100644
> --- a/configs/nitrogen6q2g_defconfig
> +++ b/configs/nitrogen6q2g_defconfig
> @@ -47,11 +47,11 @@ CONFIG_USB_STORAGE=y
> CONFIG_USB_KEYBOARD=y
> CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Boundary"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0525
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
> 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_USB_ETHER=y
> CONFIG_USB_ETH_CDC=y
> # CONFIG_VIDEO_SW_CURSOR is not set
> diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig
> index 8bca0e04439e..82b05febae40 100644
> --- a/configs/nitrogen6q_defconfig
> +++ b/configs/nitrogen6q_defconfig
> @@ -47,11 +47,11 @@ CONFIG_USB_STORAGE=y
> CONFIG_USB_KEYBOARD=y
> CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Boundary"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0525
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
> 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_USB_ETHER=y
> CONFIG_USB_ETH_CDC=y
> # CONFIG_VIDEO_SW_CURSOR is not set
> diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig
> index 668fbaa37010..3e4c20357c16 100644
> --- a/configs/nitrogen6s1g_defconfig
> +++ b/configs/nitrogen6s1g_defconfig
> @@ -46,11 +46,11 @@ CONFIG_USB_STORAGE=y
> CONFIG_USB_KEYBOARD=y
> CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Boundary"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0525
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
> 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_USB_ETHER=y
> CONFIG_USB_ETH_CDC=y
> # CONFIG_VIDEO_SW_CURSOR is not set
> diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig
> index 99106c9a1f5a..107cbfc9bc55 100644
> --- a/configs/nitrogen6s_defconfig
> +++ b/configs/nitrogen6s_defconfig
> @@ -46,11 +46,11 @@ CONFIG_USB_STORAGE=y
> CONFIG_USB_KEYBOARD=y
> CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Boundary"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0525
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
> 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_USB_ETHER=y
> CONFIG_USB_ETH_CDC=y
> # CONFIG_VIDEO_SW_CURSOR is not set
> diff --git a/configs/nyan-big_defconfig b/configs/nyan-big_defconfig
> index c8cad61497aa..96627a3463cd 100644
> --- a/configs/nyan-big_defconfig
> +++ b/configs/nyan-big_defconfig
> @@ -65,11 +65,11 @@ CONFIG_DM_USB=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="NVIDIA"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0955
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x701a
> 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 1d54207f3d35..b6330cc1f047 100644
> --- a/configs/odroid-xu3_defconfig
> +++ b/configs/odroid-xu3_defconfig
> @@ -43,9 +43,9 @@ CONFIG_USB_DWC3_GADGET=y
> CONFIG_USB_DWC3_PHY_SAMSUNG=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Samsung"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x04e8
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x6601
> 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 9c0024541d41..96d42b2bb0b9 100644
> --- a/configs/odroid_defconfig
> +++ b/configs/odroid_defconfig
> @@ -56,9 +56,9 @@ CONFIG_DM_USB=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Samsung"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x04e8
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x6601
> 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 83c0a3a2d4cd..169745822d77 100644
> --- a/configs/omap3_beagle_defconfig
> +++ b/configs/omap3_beagle_defconfig
> @@ -48,10 +48,10 @@ CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="TI"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0451
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
> CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="TI"
> -CONFIG_G_DNL_VENDOR_NUM=0x0451
> -CONFIG_G_DNL_PRODUCT_NUM=0xd022
> CONFIG_USB_ETHER=y
> CONFIG_FAT_WRITE=y
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig
> index 9f18cb69461a..8a73b69bb768 100644
> --- a/configs/omap3_evm_defconfig
> +++ b/configs/omap3_evm_defconfig
> @@ -53,10 +53,10 @@ CONFIG_USB=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0451
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x5678
> CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
> -CONFIG_G_DNL_VENDOR_NUM=0x0451
> -CONFIG_G_DNL_PRODUCT_NUM=0x5678
> CONFIG_USB_ETHER=y
> CONFIG_FAT_WRITE=y
> CONFIG_BCH=y
> diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig
> index 3bf115e6f8c8..b1693be7edd7 100644
> --- a/configs/omap3_logic_defconfig
> +++ b/configs/omap3_logic_defconfig
> @@ -45,9 +45,9 @@ CONFIG_OMAP3_SPI=y
> CONFIG_USB=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="TI"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0451
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
> CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="TI"
> -CONFIG_G_DNL_VENDOR_NUM=0x0451
> -CONFIG_G_DNL_PRODUCT_NUM=0xd022
> CONFIG_USB_ETHER=y
> CONFIG_BCH=y
> diff --git a/configs/omap5_uevm_defconfig b/configs/omap5_uevm_defconfig
> index c768f333aaa5..420d994540c7 100644
> --- a/configs/omap5_uevm_defconfig
> +++ b/configs/omap5_uevm_defconfig
> @@ -49,9 +49,9 @@ CONFIG_USB_DWC3_OMAP=y
> CONFIG_USB_DWC3_PHY_OMAP=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0403
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xbd00
> CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
> -CONFIG_G_DNL_VENDOR_NUM=0x0403
> -CONFIG_G_DNL_PRODUCT_NUM=0xbd00
> CONFIG_FAT_WRITE=y
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/opos6uldev_defconfig b/configs/opos6uldev_defconfig
> index a880c62eb6ac..0c2319272ac7 100644
> --- a/configs/opos6uldev_defconfig
> +++ b/configs/opos6uldev_defconfig
> @@ -79,10 +79,10 @@ CONFIG_USB=y
> CONFIG_DM_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Armadeus Systems"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0525
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
> CONFIG_CI_UDC=y
> CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="Armadeus Systems"
> -CONFIG_G_DNL_VENDOR_NUM=0x0525
> -CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
> CONFIG_OF_LIBFDT_OVERLAY=y
> # CONFIG_EFI_LOADER is not set
> diff --git a/configs/origen_defconfig b/configs/origen_defconfig
> index 298e7a494371..013eec185aaf 100644
> --- a/configs/origen_defconfig
> +++ b/configs/origen_defconfig
> @@ -41,8 +41,8 @@ CONFIG_MMC_SDHCI_S5P=y
> CONFIG_USB=y
> CONFIG_DM_USB=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Samsung"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x04e8
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x6601
> 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 277f302b9b19..ddcdaaaf1cf1 100644
> --- a/configs/p2371-0000_defconfig
> +++ b/configs/p2371-0000_defconfig
> @@ -36,6 +36,6 @@ CONFIG_USB_STORAGE=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_USB_GADGET_MANUFACTURER="NVIDIA"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0955
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x701a
> diff --git a/configs/p2371-2180_defconfig b/configs/p2371-2180_defconfig
> index 9d143c95dc28..7ebb6d04ca34 100644
> --- a/configs/p2371-2180_defconfig
> +++ b/configs/p2371-2180_defconfig
> @@ -43,6 +43,6 @@ CONFIG_USB_STORAGE=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_USB_GADGET_MANUFACTURER="NVIDIA"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0955
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x701a
> diff --git a/configs/p2571_defconfig b/configs/p2571_defconfig
> index c8270c70355e..07f5c5567b44 100644
> --- a/configs/p2571_defconfig
> +++ b/configs/p2571_defconfig
> @@ -36,6 +36,6 @@ CONFIG_USB_STORAGE=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_USB_GADGET_MANUFACTURER="NVIDIA"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0955
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x701a
> diff --git a/configs/parrot_r16_defconfig b/configs/parrot_r16_defconfig
> index 53825eba33c3..4b70fc5687eb 100644
> --- a/configs/parrot_r16_defconfig
> +++ b/configs/parrot_r16_defconfig
> @@ -24,7 +24,7 @@ CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x1010
> 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/phycore-rk3288_defconfig b/configs/phycore-rk3288_defconfig
> index 17855a94b53c..b8eec985301e 100644
> --- a/configs/phycore-rk3288_defconfig
> +++ b/configs/phycore-rk3288_defconfig
> @@ -70,11 +70,11 @@ CONFIG_SYSRESET=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x2207
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
> CONFIG_USB_GADGET_DWC2_OTG=y
> CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="Rockchip"
> -CONFIG_G_DNL_VENDOR_NUM=0x2207
> -CONFIG_G_DNL_PRODUCT_NUM=0x320a
> CONFIG_USE_TINY_PRINTF=y
> CONFIG_CMD_DHRYSTONE=y
> CONFIG_ERRNO_STR=y
> diff --git a/configs/pico-imx6ul_defconfig b/configs/pico-imx6ul_defconfig
> index abafc65f578c..c213493b12c0 100644
> --- a/configs/pico-imx6ul_defconfig
> +++ b/configs/pico-imx6ul_defconfig
> @@ -32,9 +32,9 @@ CONFIG_PHY_MICREL=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="FSL"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0525
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
> 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/pico-imx7d_defconfig b/configs/pico-imx7d_defconfig
> index 114c397d2e92..d34e6cecbbd9 100644
> --- a/configs/pico-imx7d_defconfig
> +++ b/configs/pico-imx7d_defconfig
> @@ -28,9 +28,9 @@ CONFIG_USB_EHCI_HCD=y
> CONFIG_MXC_USB_OTG_HACTIVE=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="FSL"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0525
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
> 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/popmetal-rk3288_defconfig b/configs/popmetal-rk3288_defconfig
> index e9bd0c4f5e38..2b39cd7038b7 100644
> --- a/configs/popmetal-rk3288_defconfig
> +++ b/configs/popmetal-rk3288_defconfig
> @@ -69,11 +69,11 @@ CONFIG_USB=y
> CONFIG_USB_DWC2=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x2207
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
> CONFIG_USB_GADGET_DWC2_OTG=y
> CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="Rockchip"
> -CONFIG_G_DNL_VENDOR_NUM=0x2207
> -CONFIG_G_DNL_PRODUCT_NUM=0x320a
> CONFIG_USE_TINY_PRINTF=y
> CONFIG_CMD_DHRYSTONE=y
> CONFIG_ERRNO_STR=y
> diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig
> index b6624f0be16c..384ad35aec9c 100644
> --- a/configs/pxm2_defconfig
> +++ b/configs/pxm2_defconfig
> @@ -70,10 +70,10 @@ CONFIG_USB_MUSB_HOST=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0908
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x02d2
> CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="Siemens AG"
> -CONFIG_G_DNL_VENDOR_NUM=0x0908
> -CONFIG_G_DNL_PRODUCT_NUM=0x02d2
> CONFIG_USB_ETHER=y
> CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
> # CONFIG_VIDEO_SW_CURSOR is not set
> diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig
> index ed5f2f841b2a..3c9c2b342359 100644
> --- a/configs/rastaban_defconfig
> +++ b/configs/rastaban_defconfig
> @@ -66,9 +66,9 @@ CONFIG_USB_MUSB_HOST=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0908
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x02d2
> CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="Siemens AG"
> -CONFIG_G_DNL_VENDOR_NUM=0x0908
> -CONFIG_G_DNL_PRODUCT_NUM=0x02d2
> CONFIG_USB_ETHER=y
> CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
> diff --git a/configs/rock2_defconfig b/configs/rock2_defconfig
> index b41644ef5fb3..d0ffdc7b0e70 100644
> --- a/configs/rock2_defconfig
> +++ b/configs/rock2_defconfig
> @@ -67,11 +67,11 @@ CONFIG_SYS_NS16550=y
> CONFIG_SYSRESET=y
> CONFIG_USB=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x2207
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
> CONFIG_USB_GADGET_DWC2_OTG=y
> CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="Rockchip"
> -CONFIG_G_DNL_VENDOR_NUM=0x2207
> -CONFIG_G_DNL_PRODUCT_NUM=0x320a
> CONFIG_DM_VIDEO=y
> CONFIG_DISPLAY=y
> CONFIG_VIDEO_ROCKCHIP=y
> diff --git a/configs/rut_defconfig b/configs/rut_defconfig
> index 1b787906baf9..1f472009321e 100644
> --- a/configs/rut_defconfig
> +++ b/configs/rut_defconfig
> @@ -71,10 +71,10 @@ CONFIG_USB_MUSB_HOST=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0908
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x02d2
> CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="Siemens AG"
> -CONFIG_G_DNL_VENDOR_NUM=0x0908
> -CONFIG_G_DNL_PRODUCT_NUM=0x02d2
> CONFIG_USB_ETHER=y
> # CONFIG_VIDEO_SW_CURSOR is not set
> CONFIG_SYS_CONSOLE_BG_COL=0xff
> diff --git a/configs/s5p_goni_defconfig b/configs/s5p_goni_defconfig
> index 7d8792cb0580..eb6c2d70c0a6 100644
> --- a/configs/s5p_goni_defconfig
> +++ b/configs/s5p_goni_defconfig
> @@ -35,9 +35,9 @@ CONFIG_DM_PMIC=y
> CONFIG_DM_PMIC_MAX8998=y
> CONFIG_USB=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Samsung"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x04e8
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x6601
> 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_FAT_WRITE=y
> diff --git a/configs/s5pc210_universal_defconfig b/configs/s5pc210_universal_defconfig
> index 16352ad7a061..e48e4b53835f 100644
> --- a/configs/s5pc210_universal_defconfig
> +++ b/configs/s5pc210_universal_defconfig
> @@ -46,8 +46,8 @@ CONFIG_DM_PMIC_MAX8998=y
> CONFIG_USB=y
> CONFIG_DM_USB=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Samsung"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x04e8
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x6601
> 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 870331673fdd..b8ff3f00c4e9 100644
> --- a/configs/smartweb_defconfig
> +++ b/configs/smartweb_defconfig
> @@ -46,8 +46,8 @@ CONFIG_PHYLIB=y
> CONFIG_USB=y
> CONFIG_DM_USB=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0908
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x02d2
> CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="Siemens AG"
> -CONFIG_G_DNL_VENDOR_NUM=0x0908
> -CONFIG_G_DNL_PRODUCT_NUM=0x02d2
> # CONFIG_EFI_LOADER is not set
> diff --git a/configs/sniper_defconfig b/configs/sniper_defconfig
> index f24153b56fd3..75371c47ce8e 100644
> --- a/configs/sniper_defconfig
> +++ b/configs/sniper_defconfig
> @@ -43,8 +43,8 @@ CONFIG_SYS_NS16550=y
> CONFIG_USB=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0451
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
> 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 cf4fa20f2c1c..dc2182138c1d 100644
> --- a/configs/socfpga_arria5_defconfig
> +++ b/configs/socfpga_arria5_defconfig
> @@ -64,9 +64,9 @@ CONFIG_DM_USB=y
> CONFIG_USB_DWC2=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="altera"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0525
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
> 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
> CONFIG_USE_TINY_PRINTF=y
> diff --git a/configs/socfpga_cyclone5_defconfig b/configs/socfpga_cyclone5_defconfig
> index 1cc6e161d969..9d465761440b 100644
> --- a/configs/socfpga_cyclone5_defconfig
> +++ b/configs/socfpga_cyclone5_defconfig
> @@ -64,9 +64,9 @@ CONFIG_DM_USB=y
> CONFIG_USB_DWC2=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="altera"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0525
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
> 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
> CONFIG_USE_TINY_PRINTF=y
> diff --git a/configs/socfpga_de0_nano_soc_defconfig b/configs/socfpga_de0_nano_soc_defconfig
> index 0bb9121c262e..7a03e8240cd3 100644
> --- a/configs/socfpga_de0_nano_soc_defconfig
> +++ b/configs/socfpga_de0_nano_soc_defconfig
> @@ -58,9 +58,9 @@ CONFIG_DM_USB=y
> CONFIG_USB_DWC2=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="terasic"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0525
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
> 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
> CONFIG_USE_TINY_PRINTF=y
> diff --git a/configs/socfpga_de10_nano_defconfig b/configs/socfpga_de10_nano_defconfig
> index 16cff90369e7..c9f9e50ac85f 100644
> --- a/configs/socfpga_de10_nano_defconfig
> +++ b/configs/socfpga_de10_nano_defconfig
> @@ -56,9 +56,9 @@ CONFIG_DM_USB=y
> CONFIG_USB_DWC2=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="terasic"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0525
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
> 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
> CONFIG_USE_TINY_PRINTF=y
> diff --git a/configs/socfpga_mcvevk_defconfig b/configs/socfpga_mcvevk_defconfig
> index 0b4ad4118f24..d06db2548cde 100644
> --- a/configs/socfpga_mcvevk_defconfig
> +++ b/configs/socfpga_mcvevk_defconfig
> @@ -58,9 +58,9 @@ CONFIG_DM_USB=y
> CONFIG_USB_DWC2=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="denx"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0525
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
> 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
> CONFIG_USE_TINY_PRINTF=y
> diff --git a/configs/socfpga_sockit_defconfig b/configs/socfpga_sockit_defconfig
> index b22bf6f608c5..1d50140119a5 100644
> --- a/configs/socfpga_sockit_defconfig
> +++ b/configs/socfpga_sockit_defconfig
> @@ -64,9 +64,9 @@ CONFIG_DM_USB=y
> CONFIG_USB_DWC2=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="terasic"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0525
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
> 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
> CONFIG_USE_TINY_PRINTF=y
> diff --git a/configs/socfpga_socrates_defconfig b/configs/socfpga_socrates_defconfig
> index 335c9e8384e4..c088c3ed479a 100644
> --- a/configs/socfpga_socrates_defconfig
> +++ b/configs/socfpga_socrates_defconfig
> @@ -64,9 +64,9 @@ CONFIG_DM_USB=y
> CONFIG_USB_DWC2=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="ebv"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0525
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
> 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
> CONFIG_USE_TINY_PRINTF=y
> diff --git a/configs/socfpga_vining_fpga_defconfig b/configs/socfpga_vining_fpga_defconfig
> index 3bcedb6d1aee..1911735af1ac 100644
> --- a/configs/socfpga_vining_fpga_defconfig
> +++ b/configs/socfpga_vining_fpga_defconfig
> @@ -81,9 +81,9 @@ CONFIG_DM_USB=y
> CONFIG_USB_DWC2=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="samtec"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0525
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
> CONFIG_USB_GADGET_DWC2_OTG=y
> CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="samtec"
> -CONFIG_G_DNL_VENDOR_NUM=0x0525
> -CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
> CONFIG_USE_TINY_PRINTF=y
> diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig
> index 71a382a3e132..bde93e958325 100644
> --- a/configs/taurus_defconfig
> +++ b/configs/taurus_defconfig
> @@ -53,8 +53,8 @@ CONFIG_PHYLIB=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0908
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x02d2
> 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
> diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig
> index 20814ccea33b..81225e865abf 100644
> --- a/configs/tbs2910_defconfig
> +++ b/configs/tbs2910_defconfig
> @@ -45,10 +45,10 @@ CONFIG_USB_STORAGE=y
> CONFIG_USB_KEYBOARD=y
> CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="TBS"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0525
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
> 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_CFB_CONSOLE_ANSI=y
> CONFIG_OF_LIBFDT=y
> diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig
> index eb9124ce23ec..d9030ec82766 100644
> --- a/configs/thuban_defconfig
> +++ b/configs/thuban_defconfig
> @@ -66,8 +66,8 @@ CONFIG_USB_MUSB_HOST=y
> CONFIG_USB_MUSB_GADGET=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0908
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x02d2
> CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="Siemens AG"
> -CONFIG_G_DNL_VENDOR_NUM=0x0908
> -CONFIG_G_DNL_PRODUCT_NUM=0x02d2
> CONFIG_USB_ETHER=y
> diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig
> index 1d3678fc0432..2d0526f614b8 100644
> --- a/configs/tinker-rk3288_defconfig
> +++ b/configs/tinker-rk3288_defconfig
> @@ -72,11 +72,11 @@ CONFIG_USB=y
> CONFIG_USB_DWC2=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x2207
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
> CONFIG_USB_GADGET_DWC2_OTG=y
> CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="Rockchip"
> -CONFIG_G_DNL_VENDOR_NUM=0x2207
> -CONFIG_G_DNL_PRODUCT_NUM=0x320a
> CONFIG_USE_TINY_PRINTF=y
> CONFIG_CMD_DHRYSTONE=y
> CONFIG_ERRNO_STR=y
> diff --git a/configs/topic_miami_defconfig b/configs/topic_miami_defconfig
> index 1080554cba37..a8028b6b18cd 100644
> --- a/configs/topic_miami_defconfig
> +++ b/configs/topic_miami_defconfig
> @@ -46,8 +46,8 @@ CONFIG_USB_ULPI_VIEWPORT=y
> CONFIG_USB_ULPI=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Xilinx"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x03fd
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
> 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/topic_miamilite_defconfig b/configs/topic_miamilite_defconfig
> index 1450fbc61aa0..568eb66d516d 100644
> --- a/configs/topic_miamilite_defconfig
> +++ b/configs/topic_miamilite_defconfig
> @@ -47,8 +47,8 @@ CONFIG_USB_ULPI_VIEWPORT=y
> CONFIG_USB_ULPI=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Xilinx"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x03fd
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
> 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/topic_miamiplus_defconfig b/configs/topic_miamiplus_defconfig
> index d3fc7ad63f32..94fa96221ce5 100644
> --- a/configs/topic_miamiplus_defconfig
> +++ b/configs/topic_miamiplus_defconfig
> @@ -46,8 +46,8 @@ CONFIG_USB_ULPI_VIEWPORT=y
> CONFIG_USB_ULPI=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Xilinx"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x03fd
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
> 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/trats2_defconfig b/configs/trats2_defconfig
> index bcc73d4fa266..a4cd8c875ca8 100644
> --- a/configs/trats2_defconfig
> +++ b/configs/trats2_defconfig
> @@ -50,8 +50,8 @@ CONFIG_DM_PMIC_MAX77686=y
> CONFIG_USB=y
> CONFIG_DM_USB=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Samsung"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x04e8
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x6601
> 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 3f0c59baadcf..5c567f660d04 100644
> --- a/configs/trats_defconfig
> +++ b/configs/trats_defconfig
> @@ -49,8 +49,8 @@ CONFIG_PMIC_MAX8997=y
> CONFIG_USB=y
> CONFIG_DM_USB=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Samsung"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x04e8
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x6601
> 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 392af0939e92..dbefb677ecfc 100644
> --- a/configs/venice2_defconfig
> +++ b/configs/venice2_defconfig
> @@ -38,8 +38,8 @@ CONFIG_DM_USB=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="NVIDIA"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0955
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x701a
> 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/warp7_defconfig b/configs/warp7_defconfig
> index 32cf7a4da4b4..c91090cac08b 100644
> --- a/configs/warp7_defconfig
> +++ b/configs/warp7_defconfig
> @@ -33,11 +33,11 @@ CONFIG_USB_EHCI_HCD=y
> CONFIG_MXC_USB_OTG_HACTIVE=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="FSL"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0525
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
> 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_USB_ETHER=y
> CONFIG_USB_ETH_CDC=y
> CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
> diff --git a/configs/warp7_secure_defconfig b/configs/warp7_secure_defconfig
> index 99764dbd0bb1..5a2b39493a24 100644
> --- a/configs/warp7_secure_defconfig
> +++ b/configs/warp7_secure_defconfig
> @@ -31,11 +31,11 @@ CONFIG_USB=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_MXC_USB_OTG_HACTIVE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="FSL"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0525
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
> 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_USB_ETHER=y
> CONFIG_USB_ETH_CDC=y
> CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
> diff --git a/configs/warp_defconfig b/configs/warp_defconfig
> index 8e58790269b8..3432a786ba78 100644
> --- a/configs/warp_defconfig
> +++ b/configs/warp_defconfig
> @@ -30,9 +30,9 @@ CONFIG_DFU_MMC=y
> CONFIG_USB=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="FSL"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x0525
> +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
> 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 c3ba5bf63242..03f529e6f4dd 100644
> --- a/configs/xilinx_zynqmp_ep_defconfig
> +++ b/configs/xilinx_zynqmp_ep_defconfig
> @@ -85,8 +85,8 @@ CONFIG_USB_DWC3_GADGET=y
> CONFIG_USB_STORAGE=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_USB_GADGET_MANUFACTURER="Xilinx"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x03fd
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
> # CONFIG_REGEX is not set
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
> index 588b15430bf6..92ac41a6f25c 100644
> --- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
> +++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
> @@ -77,7 +77,7 @@ CONFIG_USB_ULPI=y
> CONFIG_USB_STORAGE=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_USB_GADGET_MANUFACTURER="Xilinx"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x03FD
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
> index 0a3ac9dbeadc..7a40b055a199 100644
> --- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
> +++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
> @@ -75,7 +75,7 @@ CONFIG_USB_ULPI=y
> CONFIG_USB_STORAGE=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_USB_GADGET_MANUFACTURER="Xilinx"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x03FD
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig b/configs/xilinx_zynqmp_zcu102_revA_defconfig
> index ee0beda47a8e..670206800e04 100644
> --- a/configs/xilinx_zynqmp_zcu102_revA_defconfig
> +++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig
> @@ -80,7 +80,7 @@ CONFIG_USB_ULPI=y
> CONFIG_USB_STORAGE=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_USB_GADGET_MANUFACTURER="Xilinx"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x03FD
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig
> index e47e4bf6e5e1..d878c18476ec 100644
> --- a/configs/xilinx_zynqmp_zcu102_revB_defconfig
> +++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig
> @@ -80,7 +80,7 @@ CONFIG_USB_ULPI=y
> CONFIG_USB_STORAGE=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_USB_GADGET_MANUFACTURER="Xilinx"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x03FD
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
> CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
> diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig
> index ae248f51bc26..cb867010e261 100644
> --- a/configs/zynq_microzed_defconfig
> +++ b/configs/zynq_microzed_defconfig
> @@ -53,8 +53,8 @@ CONFIG_USB_ULPI_VIEWPORT=y
> CONFIG_USB_ULPI=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Xilinx"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x03FD
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
> 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_picozed_defconfig b/configs/zynq_picozed_defconfig
> index 0afdd1147a90..39d76ba96553 100644
> --- a/configs/zynq_picozed_defconfig
> +++ b/configs/zynq_picozed_defconfig
> @@ -42,8 +42,8 @@ CONFIG_USB_ULPI_VIEWPORT=y
> CONFIG_USB_ULPI=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Xilinx"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x03fd
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
> 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_z_turn_defconfig b/configs/zynq_z_turn_defconfig
> index 3684b8531fa9..d21a8faa0f64 100644
> --- a/configs/zynq_z_turn_defconfig
> +++ b/configs/zynq_z_turn_defconfig
> @@ -52,8 +52,8 @@ CONFIG_USB_ULPI_VIEWPORT=y
> CONFIG_USB_ULPI=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Xilinx"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x03FD
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
> 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 21852e55b6d4..a574a8991737 100644
> --- a/configs/zynq_zc702_defconfig
> +++ b/configs/zynq_zc702_defconfig
> @@ -60,8 +60,8 @@ CONFIG_USB_ULPI_VIEWPORT=y
> CONFIG_USB_ULPI=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Xilinx"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x03fd
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
> 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 dfafc9a9f6d5..d9718b06de2e 100644
> --- a/configs/zynq_zc706_defconfig
> +++ b/configs/zynq_zc706_defconfig
> @@ -56,8 +56,8 @@ CONFIG_USB_ULPI_VIEWPORT=y
> CONFIG_USB_ULPI=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Xilinx"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x03fd
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
> 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 bb512aff09d1..3a18c4aeb3a8 100644
> --- a/configs/zynq_zed_defconfig
> +++ b/configs/zynq_zed_defconfig
> @@ -53,8 +53,8 @@ CONFIG_USB_ULPI_VIEWPORT=y
> CONFIG_USB_ULPI=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Xilinx"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x03fd
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
> 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 fd31b4dc14f0..9edde2ace32c 100644
> --- a/configs/zynq_zybo_defconfig
> +++ b/configs/zynq_zybo_defconfig
> @@ -58,8 +58,8 @@ CONFIG_USB_ULPI_VIEWPORT=y
> CONFIG_USB_ULPI=y
> CONFIG_USB_STORAGE=y
> CONFIG_USB_GADGET=y
> +CONFIG_USB_GADGET_MANUFACTURER="Xilinx"
> +CONFIG_USB_GADGET_VENDOR_NUM=0x03fd
> +CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
> 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/doc/README.android-fastboot b/doc/README.android-fastboot
> index b8afa1576244..2c3ee7810a4f 100644
> --- a/doc/README.android-fastboot
> +++ b/doc/README.android-fastboot
> @@ -34,11 +34,11 @@ The fastboot gadget relies on the USB download gadget, so the following
> options must be configured:
>
> CONFIG_USB_GADGET_DOWNLOAD
> -CONFIG_G_DNL_VENDOR_NUM
> -CONFIG_G_DNL_PRODUCT_NUM
> -CONFIG_G_DNL_MANUFACTURER
> +CONFIG_USB_GADGET_VENDOR_NUM
> +CONFIG_USB_GADGET_PRODUCT_NUM
> +CONFIG_USB_GADGET_MANUFACTURER
>
> -NOTE: The CONFIG_G_DNL_VENDOR_NUM must be one of the numbers supported by
> +NOTE: The CONFIG_USB_GADGET_VENDOR_NUM must be one of the numbers supported by
> the fastboot client. The list of vendor IDs supported can be found in the
> fastboot client source code (fastboot.c) mentioned above.
>
> diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
> index 878495fd5d03..e463d1dee0e7 100644
> --- a/drivers/usb/gadget/Kconfig
> +++ b/drivers/usb/gadget/Kconfig
> @@ -36,6 +36,15 @@ menuconfig USB_GADGET
>
> if USB_GADGET
>
> +config USB_GADGET_MANUFACTURER
> + string "Vendor name of USB device"
> +
> +config USB_GADGET_VENDOR_NUM
> + hex "Vendor ID of USB device"
> +
> +config USB_GADGET_PRODUCT_NUM
> + hex "Product ID of USB device"
> +
> config USB_GADGET_ATMEL_USBA
> bool "Atmel USBA"
> select USB_GADGET_DUALSPEED
> @@ -110,15 +119,6 @@ config USB_FUNCTION_SDP
> allows to download images into memory and execute (jump to) them
> using the same protocol as implemented by the i.MX family's boot ROM.
>
> -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
>
> config USB_ETHER
> diff --git a/drivers/usb/gadget/g_dnl.c b/drivers/usb/gadget/g_dnl.c
> index 0491a0eea941..fd97705f1601 100644
> --- a/drivers/usb/gadget/g_dnl.c
> +++ b/drivers/usb/gadget/g_dnl.c
> @@ -24,9 +24,9 @@
>
> /*
> * One needs to define the following:
> - * CONFIG_G_DNL_VENDOR_NUM
> - * CONFIG_G_DNL_PRODUCT_NUM
> - * CONFIG_G_DNL_MANUFACTURER
> + * CONFIG_USB_GADGET_VENDOR_NUM
> + * CONFIG_USB_GADGET_PRODUCT_NUM
> + * CONFIG_USB_GADGET_MANUFACTURER
> * at e.g. ./configs/<board>_defconfig
> */
>
> @@ -44,7 +44,7 @@
>
> static const char product[] = "USB download gadget";
> static char g_dnl_serial[MAX_STRING_SERIAL];
> -static const char manufacturer[] = CONFIG_G_DNL_MANUFACTURER;
> +static const char manufacturer[] = CONFIG_USB_GADGET_MANUFACTURER;
>
> void g_dnl_set_serialnumber(char *s)
> {
> @@ -60,8 +60,8 @@ static struct usb_device_descriptor device_desc = {
> .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),
> + .idVendor = __constant_cpu_to_le16(CONFIG_USB_GADGET_VENDOR_NUM),
> + .idProduct = __constant_cpu_to_le16(CONFIG_USB_GADGET_PRODUCT_NUM),
> /* .iProduct = DYNAMIC */
> /* .iSerialNumber = DYNAMIC */
> .bNumConfigurations = 1,
> diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h
> index b84f6e3480cb..6e76729ef41c 100644
> --- a/include/configs/am43xx_evm.h
> +++ b/include/configs/am43xx_evm.h
> @@ -89,9 +89,9 @@
>
> #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_MANUFACTURER
> +#undef CONFIG_USB_GADGET_VENDOR_NUM
> +#undef CONFIG_USB_GADGET_PRODUCT_NUM
> #undef CONFIG_USB_GADGET_DUALSPEED
> #endif
>
> diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h
> index 8bc7fbde9e36..13a45010bf5b 100644
> --- a/include/configs/odroid_xu3.h
> +++ b/include/configs/odroid_xu3.h
> @@ -45,7 +45,7 @@
> #define DFU_MANIFEST_POLL_TIMEOUT 25000
>
> /* THOR */
> -#define CONFIG_G_DNL_THOR_VENDOR_NUM CONFIG_G_DNL_VENDOR_NUM
> +#define CONFIG_G_DNL_THOR_VENDOR_NUM CONFIG_USB_GADGET_VENDOR_NUM
> #define CONFIG_G_DNL_THOR_PRODUCT_NUM 0x685D
> #define CONFIG_USB_FUNCTION_THOR
>
>
--
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
More information about the U-Boot
mailing list