Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 813019,
    "url": "http://patchwork.ozlabs.org/api/patches/813019/?format=api",
    "web_url": "http://patchwork.ozlabs.org/project/uboot/patch/964cd14d275e38395a95f08a21833864f07c3815.1505242834.git-series.maxime.ripard@free-electrons.com/",
    "project": {
        "id": 18,
        "url": "http://patchwork.ozlabs.org/api/projects/18/?format=api",
        "name": "U-Boot",
        "link_name": "uboot",
        "list_id": "u-boot.lists.denx.de",
        "list_email": "u-boot@lists.denx.de",
        "web_url": null,
        "scm_url": null,
        "webscm_url": null,
        "list_archive_url": "",
        "list_archive_url_format": "",
        "commit_url_format": ""
    },
    "msgid": "<964cd14d275e38395a95f08a21833864f07c3815.1505242834.git-series.maxime.ripard@free-electrons.com>",
    "list_archive_url": null,
    "date": "2017-09-12T19:01:34",
    "name": "[U-Boot,v2,06/14] usb: gadget: Make g_dnl USB settings common",
    "commit_ref": null,
    "pull_url": null,
    "state": "accepted",
    "archived": false,
    "hash": "610ede6a1d3e429406f99ff1cd467f336e504ce1",
    "submitter": {
        "id": 12916,
        "url": "http://patchwork.ozlabs.org/api/people/12916/?format=api",
        "name": "Maxime Ripard",
        "email": "maxime.ripard@free-electrons.com"
    },
    "delegate": {
        "id": 68827,
        "url": "http://patchwork.ozlabs.org/api/users/68827/?format=api",
        "username": "lukma",
        "first_name": "Lukasz",
        "last_name": "Majewski",
        "email": "lukma@denx.de"
    },
    "mbox": "http://patchwork.ozlabs.org/project/uboot/patch/964cd14d275e38395a95f08a21833864f07c3815.1505242834.git-series.maxime.ripard@free-electrons.com/mbox/",
    "series": [
        {
            "id": 2759,
            "url": "http://patchwork.ozlabs.org/api/series/2759/?format=api",
            "web_url": "http://patchwork.ozlabs.org/project/uboot/list/?series=2759",
            "date": "2017-09-12T19:01:28",
            "name": "sunxi: convert musb to the device model and enable usb_ether",
            "version": 2,
            "mbox": "http://patchwork.ozlabs.org/series/2759/mbox/"
        }
    ],
    "comments": "http://patchwork.ozlabs.org/api/patches/813019/comments/",
    "check": "pending",
    "checks": "http://patchwork.ozlabs.org/api/patches/813019/checks/",
    "tags": {},
    "related": [],
    "headers": {
        "Return-Path": "<u-boot-bounces@lists.denx.de>",
        "X-Original-To": "incoming@patchwork.ozlabs.org",
        "Delivered-To": "patchwork-incoming@bilbo.ozlabs.org",
        "Authentication-Results": "ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=lists.denx.de\n\t(client-ip=81.169.180.215; helo=lists.denx.de;\n\tenvelope-from=u-boot-bounces@lists.denx.de;\n\treceiver=<UNKNOWN>)",
        "Received": [
            "from lists.denx.de (dione.denx.de [81.169.180.215])\n\tby ozlabs.org (Postfix) with ESMTP id 3xsDny1jpJz9s7g\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 13 Sep 2017 05:07:49 +1000 (AEST)",
            "by lists.denx.de (Postfix, from userid 105)\n\tid 20585C2204C; Tue, 12 Sep 2017 19:06:30 +0000 (UTC)",
            "from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id 97EC9C21FF5;\n\tTue, 12 Sep 2017 19:02:02 +0000 (UTC)",
            "by lists.denx.de (Postfix, from userid 105)\n\tid 176D3C21DAD; Tue, 12 Sep 2017 19:01:56 +0000 (UTC)",
            "from mail.free-electrons.com (mail.free-electrons.com [62.4.15.54])\n\tby lists.denx.de (Postfix) with ESMTP id EC0F7C2202D\n\tfor <u-boot@lists.denx.de>; Tue, 12 Sep 2017 19:01:49 +0000 (UTC)",
            "by mail.free-electrons.com (Postfix, from userid 110)\n\tid BC3722092C; Tue, 12 Sep 2017 21:01:49 +0200 (CEST)",
            "from localhost (LFbn-TOU-1-209-191.w86-201.abo.wanadoo.fr\n\t[86.201.56.191])\n\tby mail.free-electrons.com (Postfix) with ESMTPSA id 6C6D62091D;\n\tTue, 12 Sep 2017 21:01:49 +0200 (CEST)"
        ],
        "X-Spam-Checker-Version": "SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de",
        "X-Spam-Level": "",
        "X-Spam-Status": "No, score=0.8 required=5.0 tests=UPPERCASE_50_75 autolearn=no\n\tautolearn_force=no version=3.4.0",
        "From": "Maxime Ripard <maxime.ripard@free-electrons.com>",
        "To": "Tom Rini <trini@konsulko.com>,\n\tJagan Teki <jagan@openedev.com>",
        "Date": "Tue, 12 Sep 2017 21:01:34 +0200",
        "Message-Id": "<964cd14d275e38395a95f08a21833864f07c3815.1505242834.git-series.maxime.ripard@free-electrons.com>",
        "X-Mailer": "git-send-email 2.13.5",
        "In-Reply-To": [
            "<cover.afe89ac52a0b82d1c12952c3cb82bb3762c85fa8.1505242834.git-series.maxime.ripard@free-electrons.com>",
            "<cover.afe89ac52a0b82d1c12952c3cb82bb3762c85fa8.1505242834.git-series.maxime.ripard@free-electrons.com>"
        ],
        "References": [
            "<cover.afe89ac52a0b82d1c12952c3cb82bb3762c85fa8.1505242834.git-series.maxime.ripard@free-electrons.com>",
            "<cover.afe89ac52a0b82d1c12952c3cb82bb3762c85fa8.1505242834.git-series.maxime.ripard@free-electrons.com>"
        ],
        "Cc": "Thomas Petazzoni <thomas.petazzoni@free-electrons.com>, marex@denx.de,\n\tu-boot@lists.denx.de, Maxime Ripard <maxime.ripard@free-electrons.com>",
        "Subject": "[U-Boot] [PATCH v2 06/14] usb: gadget: Make g_dnl USB settings\n\tcommon",
        "X-BeenThere": "u-boot@lists.denx.de",
        "X-Mailman-Version": "2.1.18",
        "Precedence": "list",
        "List-Id": "U-Boot discussion <u-boot.lists.denx.de>",
        "List-Unsubscribe": "<https://lists.denx.de/options/u-boot>,\n\t<mailto:u-boot-request@lists.denx.de?subject=unsubscribe>",
        "List-Archive": "<http://lists.denx.de/pipermail/u-boot/>",
        "List-Post": "<mailto:u-boot@lists.denx.de>",
        "List-Help": "<mailto:u-boot-request@lists.denx.de?subject=help>",
        "List-Subscribe": "<https://lists.denx.de/listinfo/u-boot>,\n\t<mailto:u-boot-request@lists.denx.de?subject=subscribe>",
        "MIME-Version": "1.0",
        "Content-Type": "text/plain; charset=\"utf-8\"",
        "Content-Transfer-Encoding": "base64",
        "Errors-To": "u-boot-bounces@lists.denx.de",
        "Sender": "\"U-Boot\" <u-boot-bounces@lists.denx.de>"
    },
    "content": "The g_dnl USB settings for the vendor ID, product ID and manufacturer are\nactually common settings that can and should be shared by all the gadgets.\n\nMake them common by renaming them, and convert all the users.\n\nReviewed-by: Simon Glass <sjg@chromium.org>\nReviewed-by: Lukasz Majewski <lukma@denx.de>\nSigned-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>\n---\n board/samsung/common/gadget.c                    |  4 +--\n board/siemens/common/factoryset.c                |  4 +--\n configs/A13-OLinuXino_defconfig                  |  6 ++--\n configs/A20-OLinuXino-Lime2-eMMC_defconfig       |  6 ++--\n configs/A20-OLinuXino-Lime2_defconfig            |  6 ++--\n configs/CHIP_defconfig                           |  6 ++--\n configs/CHIP_pro_defconfig                       |  6 ++--\n configs/Cubietruck_defconfig                     |  6 ++--\n configs/Nintendo_NES_Classic_Edition_defconfig   |  6 ++--\n configs/Sinlinx_SinA33_defconfig                 |  6 ++--\n configs/am335x_baltos_defconfig                  |  6 ++--\n configs/am335x_boneblack_defconfig               |  6 ++--\n configs/am335x_boneblack_vboot_defconfig         |  6 ++--\n configs/am335x_evm_defconfig                     |  6 ++--\n configs/am335x_evm_nor_defconfig                 |  6 ++--\n configs/am335x_evm_norboot_defconfig             |  6 ++--\n configs/am335x_evm_spiboot_defconfig             |  6 ++--\n configs/am335x_evm_usbspl_defconfig              |  6 ++--\n configs/am335x_hs_evm_defconfig                  |  6 ++--\n configs/am43xx_evm_defconfig                     |  6 ++--\n configs/am43xx_evm_ethboot_defconfig             |  6 ++--\n configs/am43xx_evm_qspiboot_defconfig            |  6 ++--\n configs/am43xx_evm_usbhost_boot_defconfig        |  6 ++--\n configs/am43xx_hs_evm_defconfig                  |  6 ++--\n configs/am57xx_evm_defconfig                     |  6 ++--\n configs/am57xx_evm_nodt_defconfig                |  6 ++--\n configs/am57xx_hs_evm_defconfig                  |  6 ++--\n configs/apalis-tk1_defconfig                     |  6 ++--\n configs/apalis_imx6_defconfig                    |  6 ++--\n configs/apalis_imx6_nospl_com_defconfig          |  6 ++--\n configs/apalis_imx6_nospl_it_defconfig           |  6 ++--\n configs/apalis_t30_defconfig                     |  6 ++--\n configs/bcm11130_defconfig                       |  6 ++--\n configs/bcm11130_nand_defconfig                  |  6 ++--\n configs/bcm23550_w1d_defconfig                   |  6 ++--\n configs/bcm28155_ap_defconfig                    |  6 ++--\n configs/bcm28155_w1d_defconfig                   |  6 ++--\n configs/beaver_defconfig                         |  6 ++--\n configs/birdland_bav335a_defconfig               |  6 ++--\n configs/birdland_bav335b_defconfig               |  6 ++--\n configs/cei-tk1-som_defconfig                    |  6 ++--\n configs/cgtqmx6eval_defconfig                    |  6 ++--\n configs/chromebit_mickey_defconfig               |  6 ++--\n configs/chromebook_jerry_defconfig               |  6 ++--\n configs/chromebook_minnie_defconfig              |  6 ++--\n configs/colibri_imx6_defconfig                   |  6 ++--\n configs/colibri_imx6_nospl_defconfig             |  6 ++--\n configs/colibri_imx7_defconfig                   |  6 ++--\n configs/colibri_t20_defconfig                    |  6 ++--\n configs/colibri_t30_defconfig                    |  6 ++--\n configs/colibri_vf_defconfig                     |  6 ++--\n configs/corvus_defconfig                         |  6 ++--\n configs/dalmore_defconfig                        |  6 ++--\n configs/dms-ba16-1g_defconfig                    |  6 ++--\n configs/dms-ba16_defconfig                       |  6 ++--\n configs/dra7xx_evm_defconfig                     |  6 ++--\n configs/dra7xx_hs_evm_defconfig                  |  6 ++--\n configs/draco_defconfig                          |  6 ++--\n configs/e2220-1170_defconfig                     |  6 ++--\n configs/edison_defconfig                         |  6 ++--\n configs/etamin_defconfig                         |  6 ++--\n configs/evb-rk3036_defconfig                     |  6 ++--\n configs/evb-rk3229_defconfig                     |  6 ++--\n configs/evb-rk3288_defconfig                     |  6 ++--\n configs/evb-rk3328_defconfig                     |  6 ++--\n configs/fennec-rk3288_defconfig                  |  6 ++--\n configs/firefly-rk3288_defconfig                 |  6 ++--\n configs/gwventana_emmc_defconfig                 |  6 ++--\n configs/gwventana_gw5904_defconfig               |  6 ++--\n configs/gwventana_nand_defconfig                 |  6 ++--\n configs/jetson-tk1_defconfig                     |  6 ++--\n configs/kc1_defconfig                            |  6 ++--\n configs/kylin-rk3036_defconfig                   |  6 ++--\n configs/ma5d4evk_defconfig                       |  6 ++--\n configs/miqi-rk3288_defconfig                    |  6 ++--\n configs/mx6qsabrelite_defconfig                  |  6 ++--\n configs/mx6sabreauto_defconfig                   |  6 ++--\n configs/mx6sabresd_defconfig                     |  6 ++--\n configs/mx7dsabresd_defconfig                    |  6 ++--\n configs/mx7dsabresd_secure_defconfig             |  6 ++--\n configs/nitrogen6dl2g_defconfig                  |  6 ++--\n configs/nitrogen6dl_defconfig                    |  6 ++--\n configs/nitrogen6q2g_defconfig                   |  6 ++--\n configs/nitrogen6q_defconfig                     |  6 ++--\n configs/nitrogen6s1g_defconfig                   |  6 ++--\n configs/nitrogen6s_defconfig                     |  6 ++--\n configs/nyan-big_defconfig                       |  6 ++--\n configs/odroid-xu3_defconfig                     |  6 ++--\n configs/odroid_defconfig                         |  6 ++--\n configs/omap3_beagle_defconfig                   |  6 ++--\n configs/omap3_evm_defconfig                      |  6 ++--\n configs/omap3_logic_defconfig                    |  6 ++--\n configs/omap5_uevm_defconfig                     |  6 ++--\n configs/opos6uldev_defconfig                     |  6 ++--\n configs/origen_defconfig                         |  6 ++--\n configs/p2371-0000_defconfig                     |  6 ++--\n configs/p2371-2180_defconfig                     |  6 ++--\n configs/p2571_defconfig                          |  6 ++--\n configs/parrot_r16_defconfig                     |  6 ++--\n configs/phycore-rk3288_defconfig                 |  6 ++--\n configs/pico-imx6ul_defconfig                    |  6 ++--\n configs/pico-imx7d_defconfig                     |  6 ++--\n configs/popmetal-rk3288_defconfig                |  6 ++--\n configs/pxm2_defconfig                           |  6 ++--\n configs/rastaban_defconfig                       |  6 ++--\n configs/rock2_defconfig                          |  6 ++--\n configs/rut_defconfig                            |  6 ++--\n configs/s5p_goni_defconfig                       |  6 ++--\n configs/s5pc210_universal_defconfig              |  6 ++--\n configs/smartweb_defconfig                       |  6 ++--\n configs/sniper_defconfig                         |  6 ++--\n configs/socfpga_arria5_defconfig                 |  6 ++--\n configs/socfpga_cyclone5_defconfig               |  6 ++--\n configs/socfpga_de0_nano_soc_defconfig           |  6 ++--\n configs/socfpga_de10_nano_defconfig              |  6 ++--\n configs/socfpga_mcvevk_defconfig                 |  6 ++--\n configs/socfpga_sockit_defconfig                 |  6 ++--\n configs/socfpga_socrates_defconfig               |  6 ++--\n configs/socfpga_vining_fpga_defconfig            |  6 ++--\n configs/taurus_defconfig                         |  6 ++--\n configs/tbs2910_defconfig                        |  6 ++--\n configs/thuban_defconfig                         |  6 ++--\n configs/tinker-rk3288_defconfig                  |  6 ++--\n configs/topic_miami_defconfig                    |  6 ++--\n configs/topic_miamilite_defconfig                |  6 ++--\n configs/topic_miamiplus_defconfig                |  6 ++--\n configs/trats2_defconfig                         |  6 ++--\n configs/trats_defconfig                          |  6 ++--\n configs/venice2_defconfig                        |  6 ++--\n configs/warp7_defconfig                          |  6 ++--\n configs/warp7_secure_defconfig                   |  6 ++--\n configs/warp_defconfig                           |  6 ++--\n configs/xilinx_zynqmp_ep_defconfig               |  6 ++--\n configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig |  6 ++--\n configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig |  6 ++--\n configs/xilinx_zynqmp_zcu102_revA_defconfig      |  6 ++--\n configs/xilinx_zynqmp_zcu102_revB_defconfig      |  6 ++--\n configs/zynq_microzed_defconfig                  |  6 ++--\n configs/zynq_picozed_defconfig                   |  6 ++--\n configs/zynq_z_turn_defconfig                    |  6 ++--\n configs/zynq_zc702_defconfig                     |  6 ++--\n configs/zynq_zc706_defconfig                     |  6 ++--\n configs/zynq_zed_defconfig                       |  6 ++--\n configs/zynq_zybo_defconfig                      |  6 ++--\n doc/README.android-fastboot                      |  8 ++---\n drivers/usb/gadget/Kconfig                       | 25 ++++++++++-------\n drivers/usb/gadget/g_dnl.c                       | 12 ++++----\n include/configs/am43xx_evm.h                     |  6 ++--\n include/configs/odroid_xu3.h                     |  2 +-\n 149 files changed, 460 insertions(+), 453 deletions(-)",
    "diff": "diff --git a/board/samsung/common/gadget.c b/board/samsung/common/gadget.c\nindex 6a1e57f1645c..ef732befc44e 100644\n--- a/board/samsung/common/gadget.c\n+++ b/board/samsung/common/gadget.c\n@@ -17,8 +17,8 @@ int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name)\n \t\tput_unaligned(CONFIG_G_DNL_UMS_VENDOR_NUM, &dev->idVendor);\n \t\tput_unaligned(CONFIG_G_DNL_UMS_PRODUCT_NUM, &dev->idProduct);\n \t} else {\n-\t\tput_unaligned(CONFIG_G_DNL_VENDOR_NUM, &dev->idVendor);\n-\t\tput_unaligned(CONFIG_G_DNL_PRODUCT_NUM, &dev->idProduct);\n+\t\tput_unaligned(CONFIG_USB_GADGET_VENDOR_NUM, &dev->idVendor);\n+\t\tput_unaligned(CONFIG_USB_GADGET_PRODUCT_NUM, &dev->idProduct);\n \t}\n \treturn 0;\n }\ndiff --git a/board/siemens/common/factoryset.c b/board/siemens/common/factoryset.c\nindex b4f027af2862..81bbb5758d0b 100644\n--- a/board/siemens/common/factoryset.c\n+++ b/board/siemens/common/factoryset.c\n@@ -145,8 +145,8 @@ int factoryset_read_eeprom(int i2c_addr)\n \tunsigned char *cp, *cp1;\n \n #if defined(CONFIG_USB_FUNCTION_DFU)\n-\tfactory_dat.usb_vendor_id = CONFIG_G_DNL_VENDOR_NUM;\n-\tfactory_dat.usb_product_id = CONFIG_G_DNL_PRODUCT_NUM;\n+\tfactory_dat.usb_vendor_id = CONFIG_USB_GADGET_VENDOR_NUM;\n+\tfactory_dat.usb_product_id = CONFIG_USB_GADGET_PRODUCT_NUM;\n #endif\n \tif (i2c_probe(i2c_addr))\n \t\tgoto err;\ndiff --git a/configs/A13-OLinuXino_defconfig b/configs/A13-OLinuXino_defconfig\nindex fbacce07cf0c..2574018d8213 100644\n--- a/configs/A13-OLinuXino_defconfig\n+++ b/configs/A13-OLinuXino_defconfig\n@@ -32,7 +32,7 @@ CONFIG_USB_EHCI_HCD=y\n CONFIG_USB_MUSB_GADGET=y\n CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Allwinner Technology\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x1010\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Allwinner Technology\"\n-CONFIG_G_DNL_VENDOR_NUM=0x1f3a\n-CONFIG_G_DNL_PRODUCT_NUM=0x1010\ndiff --git a/configs/A20-OLinuXino-Lime2-eMMC_defconfig b/configs/A20-OLinuXino-Lime2-eMMC_defconfig\nindex 58aa988b2363..5663a824e71b 100644\n--- a/configs/A20-OLinuXino-Lime2-eMMC_defconfig\n+++ b/configs/A20-OLinuXino-Lime2-eMMC_defconfig\n@@ -34,7 +34,7 @@ CONFIG_USB_EHCI_HCD=y\n CONFIG_USB_MUSB_GADGET=y\n CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Allwinner Technology\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x1010\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Allwinner Technology\"\n-CONFIG_G_DNL_VENDOR_NUM=0x1f3a\n-CONFIG_G_DNL_PRODUCT_NUM=0x1010\ndiff --git a/configs/A20-OLinuXino-Lime2_defconfig b/configs/A20-OLinuXino-Lime2_defconfig\nindex 6d7c58861373..63d013293690 100644\n--- a/configs/A20-OLinuXino-Lime2_defconfig\n+++ b/configs/A20-OLinuXino-Lime2_defconfig\n@@ -33,7 +33,7 @@ CONFIG_USB_EHCI_HCD=y\n CONFIG_USB_MUSB_GADGET=y\n CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Allwinner Technology\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x1010\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Allwinner Technology\"\n-CONFIG_G_DNL_VENDOR_NUM=0x1f3a\n-CONFIG_G_DNL_PRODUCT_NUM=0x1010\ndiff --git a/configs/CHIP_defconfig b/configs/CHIP_defconfig\nindex 83228bd10f05..278039c05573 100644\n--- a/configs/CHIP_defconfig\n+++ b/configs/CHIP_defconfig\n@@ -23,8 +23,8 @@ CONFIG_USB_EHCI_HCD=y\n CONFIG_USB_MUSB_GADGET=y\n CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Allwinner Technology\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x1010\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Allwinner Technology\"\n-CONFIG_G_DNL_VENDOR_NUM=0x1f3a\n-CONFIG_G_DNL_PRODUCT_NUM=0x1010\n CONFIG_OF_LIBFDT_OVERLAY=y\ndiff --git a/configs/CHIP_pro_defconfig b/configs/CHIP_pro_defconfig\nindex 3a748fc27e07..edbdefc69ddf 100644\n--- a/configs/CHIP_pro_defconfig\n+++ b/configs/CHIP_pro_defconfig\n@@ -28,8 +28,8 @@ CONFIG_USB_EHCI_HCD=y\n CONFIG_USB_MUSB_GADGET=y\n CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Allwinner Technology\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x1010\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Allwinner Technology\"\n-CONFIG_G_DNL_VENDOR_NUM=0x1f3a\n-CONFIG_G_DNL_PRODUCT_NUM=0x1010\n CONFIG_OF_LIBFDT_OVERLAY=y\ndiff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig\nindex f93ff0d6c463..2d1753645b0f 100644\n--- a/configs/Cubietruck_defconfig\n+++ b/configs/Cubietruck_defconfig\n@@ -33,7 +33,7 @@ CONFIG_USB_EHCI_HCD=y\n CONFIG_USB_MUSB_GADGET=y\n CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Allwinner Technology\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x1010\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Allwinner Technology\"\n-CONFIG_G_DNL_VENDOR_NUM=0x1f3a\n-CONFIG_G_DNL_PRODUCT_NUM=0x1010\ndiff --git a/configs/Nintendo_NES_Classic_Edition_defconfig b/configs/Nintendo_NES_Classic_Edition_defconfig\nindex d05375d0dbd5..99f7d30f150d 100644\n--- a/configs/Nintendo_NES_Classic_Edition_defconfig\n+++ b/configs/Nintendo_NES_Classic_Edition_defconfig\n@@ -23,7 +23,7 @@ CONFIG_AXP_ELDO2_VOLT=1800\n CONFIG_USB_MUSB_GADGET=y\n CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Allwinner Technology\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x1010\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Allwinner Technology\"\n-CONFIG_G_DNL_VENDOR_NUM=0x1f3a\n-CONFIG_G_DNL_PRODUCT_NUM=0x1010\ndiff --git a/configs/Sinlinx_SinA33_defconfig b/configs/Sinlinx_SinA33_defconfig\nindex af00e5434763..8c5fc7587909 100644\n--- a/configs/Sinlinx_SinA33_defconfig\n+++ b/configs/Sinlinx_SinA33_defconfig\n@@ -28,7 +28,7 @@ CONFIG_USB_EHCI_HCD=y\n CONFIG_USB_MUSB_GADGET=y\n CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Allwinner Technology\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x1010\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Allwinner Technology\"\n-CONFIG_G_DNL_VENDOR_NUM=0x1f3a\n-CONFIG_G_DNL_PRODUCT_NUM=0x1010\ndiff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig\nindex 2f075091b27a..efcbc523749c 100644\n--- a/configs/am335x_baltos_defconfig\n+++ b/configs/am335x_baltos_defconfig\n@@ -59,10 +59,10 @@ CONFIG_USB_MUSB_HOST=y\n CONFIG_USB_MUSB_GADGET=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Texas Instruments\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0403\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xbd00\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Texas Instruments\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0403\n-CONFIG_G_DNL_PRODUCT_NUM=0xbd00\n CONFIG_USB_ETHER=y\n CONFIG_USBNET_HOST_ADDR=\"de:ad:be:af:00:00\"\n CONFIG_FAT_WRITE=y\ndiff --git a/configs/am335x_boneblack_defconfig b/configs/am335x_boneblack_defconfig\nindex a3dd9b03b538..85f220329e4e 100644\n--- a/configs/am335x_boneblack_defconfig\n+++ b/configs/am335x_boneblack_defconfig\n@@ -38,10 +38,10 @@ CONFIG_USB_MUSB_HOST=y\n CONFIG_USB_MUSB_GADGET=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Texas Instruments\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0451\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xd022\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Texas Instruments\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0451\n-CONFIG_G_DNL_PRODUCT_NUM=0xd022\n CONFIG_USB_ETHER=y\n CONFIG_USBNET_HOST_ADDR=\"de:ad:be:af:00:00\"\n CONFIG_LZO=y\ndiff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig\nindex 7d52382c24dc..9ba3f7c04d73 100644\n--- a/configs/am335x_boneblack_vboot_defconfig\n+++ b/configs/am335x_boneblack_vboot_defconfig\n@@ -48,9 +48,9 @@ CONFIG_USB_MUSB_HOST=y\n CONFIG_USB_MUSB_GADGET=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Texas Instruments\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0451\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xd022\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Texas Instruments\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0451\n-CONFIG_G_DNL_PRODUCT_NUM=0xd022\n CONFIG_USB_ETHER=y\n CONFIG_LZO=y\ndiff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig\nindex 69b2cf3e1f61..8aa3c0de8824 100644\n--- a/configs/am335x_evm_defconfig\n+++ b/configs/am335x_evm_defconfig\n@@ -50,10 +50,10 @@ CONFIG_USB_MUSB_GADGET=y\n CONFIG_USB_MUSB_TI=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Texas Instruments\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0451\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xd022\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Texas Instruments\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0451\n-CONFIG_G_DNL_PRODUCT_NUM=0xd022\n CONFIG_USB_ETHER=y\n CONFIG_RSA=y\n CONFIG_LZO=y\ndiff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig\nindex 708df4284093..b745f2997334 100644\n--- a/configs/am335x_evm_nor_defconfig\n+++ b/configs/am335x_evm_nor_defconfig\n@@ -37,10 +37,10 @@ CONFIG_USB_MUSB_HOST=y\n CONFIG_USB_MUSB_GADGET=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Texas Instruments\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0451\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xd022\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Texas Instruments\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0451\n-CONFIG_G_DNL_PRODUCT_NUM=0xd022\n CONFIG_USB_ETHER=y\n CONFIG_LZO=y\n CONFIG_OF_LIBFDT=y\ndiff --git a/configs/am335x_evm_norboot_defconfig b/configs/am335x_evm_norboot_defconfig\nindex 3f6f2798adce..9662b6684c1f 100644\n--- a/configs/am335x_evm_norboot_defconfig\n+++ b/configs/am335x_evm_norboot_defconfig\n@@ -31,10 +31,10 @@ CONFIG_USB_MUSB_HOST=y\n CONFIG_USB_MUSB_GADGET=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Texas Instruments\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0451\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xd022\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Texas Instruments\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0451\n-CONFIG_G_DNL_PRODUCT_NUM=0xd022\n CONFIG_USB_ETHER=y\n CONFIG_USBNET_HOST_ADDR=\"de:ad:be:af:00:00\"\n CONFIG_LZO=y\ndiff --git a/configs/am335x_evm_spiboot_defconfig b/configs/am335x_evm_spiboot_defconfig\nindex 427ca371815c..5e2c19066daa 100644\n--- a/configs/am335x_evm_spiboot_defconfig\n+++ b/configs/am335x_evm_spiboot_defconfig\n@@ -35,10 +35,10 @@ CONFIG_USB_MUSB_HOST=y\n CONFIG_USB_MUSB_GADGET=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Texas Instruments\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0451\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xd022\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Texas Instruments\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0451\n-CONFIG_G_DNL_PRODUCT_NUM=0xd022\n CONFIG_USB_ETHER=y\n CONFIG_LZO=y\n CONFIG_OF_LIBFDT=y\ndiff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig\nindex a4e9e8f1b27b..d6c21b8e85ee 100644\n--- a/configs/am335x_evm_usbspl_defconfig\n+++ b/configs/am335x_evm_usbspl_defconfig\n@@ -41,10 +41,10 @@ CONFIG_USB_MUSB_HOST=y\n CONFIG_USB_MUSB_GADGET=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Texas Instruments\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0451\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xd022\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Texas Instruments\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0451\n-CONFIG_G_DNL_PRODUCT_NUM=0xd022\n CONFIG_USB_ETHER=y\n CONFIG_LZO=y\n CONFIG_OF_LIBFDT=y\ndiff --git a/configs/am335x_hs_evm_defconfig b/configs/am335x_hs_evm_defconfig\nindex 552150732398..683c102d0f1f 100644\n--- a/configs/am335x_hs_evm_defconfig\n+++ b/configs/am335x_hs_evm_defconfig\n@@ -54,10 +54,10 @@ CONFIG_USB_MUSB_GADGET=y\n CONFIG_USB_MUSB_TI=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Texas Instruments\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0451\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xd022\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Texas Instruments\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0451\n-CONFIG_G_DNL_PRODUCT_NUM=0xd022\n CONFIG_USB_ETHER=y\n CONFIG_RSA=y\n CONFIG_LZO=y\ndiff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig\nindex 15c25d39f1ae..ce5d0eb29142 100644\n--- a/configs/am43xx_evm_defconfig\n+++ b/configs/am43xx_evm_defconfig\n@@ -52,7 +52,7 @@ CONFIG_USB_DWC3_OMAP=y\n CONFIG_USB_DWC3_PHY_OMAP=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Texas Instruments\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0403\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xbd00\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Texas Instruments\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0403\n-CONFIG_G_DNL_PRODUCT_NUM=0xbd00\ndiff --git a/configs/am43xx_evm_ethboot_defconfig b/configs/am43xx_evm_ethboot_defconfig\nindex 6c170888680c..7bcec25af36f 100644\n--- a/configs/am43xx_evm_ethboot_defconfig\n+++ b/configs/am43xx_evm_ethboot_defconfig\n@@ -61,8 +61,8 @@ CONFIG_USB_DWC3_OMAP=y\n CONFIG_USB_DWC3_PHY_OMAP=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Texas Instruments\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0403\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xbd00\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Texas Instruments\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0403\n-CONFIG_G_DNL_PRODUCT_NUM=0xbd00\n CONFIG_OF_LIBFDT=y\ndiff --git a/configs/am43xx_evm_qspiboot_defconfig b/configs/am43xx_evm_qspiboot_defconfig\nindex fde41c5c7e1c..e72d435cfe06 100644\n--- a/configs/am43xx_evm_qspiboot_defconfig\n+++ b/configs/am43xx_evm_qspiboot_defconfig\n@@ -52,9 +52,9 @@ CONFIG_USB_DWC3_OMAP=y\n CONFIG_USB_DWC3_PHY_OMAP=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Texas Instruments\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0403\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xbd00\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Texas Instruments\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0403\n-CONFIG_G_DNL_PRODUCT_NUM=0xbd00\n CONFIG_FAT_WRITE=y\n CONFIG_OF_LIBFDT=y\ndiff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig\nindex 0bed33572297..8109f98b4b7c 100644\n--- a/configs/am43xx_evm_usbhost_boot_defconfig\n+++ b/configs/am43xx_evm_usbhost_boot_defconfig\n@@ -75,7 +75,7 @@ CONFIG_USB_DWC3_OMAP=y\n CONFIG_USB_DWC3_PHY_OMAP=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Texas Instruments\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0403\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xbd00\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Texas Instruments\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0403\n-CONFIG_G_DNL_PRODUCT_NUM=0xbd00\ndiff --git a/configs/am43xx_hs_evm_defconfig b/configs/am43xx_hs_evm_defconfig\nindex a4d23e10b60e..da7dbfb02b9e 100644\n--- a/configs/am43xx_hs_evm_defconfig\n+++ b/configs/am43xx_hs_evm_defconfig\n@@ -63,7 +63,7 @@ CONFIG_USB_DWC3_OMAP=y\n CONFIG_USB_DWC3_PHY_OMAP=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Texas Instruments\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0403\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xbd00\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Texas Instruments\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0403\n-CONFIG_G_DNL_PRODUCT_NUM=0xbd00\ndiff --git a/configs/am57xx_evm_defconfig b/configs/am57xx_evm_defconfig\nindex 3d455eb7d4e1..a9ee2e448f3c 100644\n--- a/configs/am57xx_evm_defconfig\n+++ b/configs/am57xx_evm_defconfig\n@@ -72,7 +72,7 @@ CONFIG_USB_DWC3_OMAP=y\n CONFIG_USB_DWC3_PHY_OMAP=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Texas Instruments\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0451\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xd022\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Texas Instruments\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0451\n-CONFIG_G_DNL_PRODUCT_NUM=0xd022\ndiff --git a/configs/am57xx_evm_nodt_defconfig b/configs/am57xx_evm_nodt_defconfig\nindex f96348699bad..ae7c3464e0cb 100644\n--- a/configs/am57xx_evm_nodt_defconfig\n+++ b/configs/am57xx_evm_nodt_defconfig\n@@ -62,9 +62,9 @@ CONFIG_USB_DWC3_OMAP=y\n CONFIG_USB_DWC3_PHY_OMAP=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Texas Instruments\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0451\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xd022\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Texas Instruments\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0451\n-CONFIG_G_DNL_PRODUCT_NUM=0xd022\n CONFIG_FAT_WRITE=y\n CONFIG_OF_LIBFDT=y\ndiff --git a/configs/am57xx_hs_evm_defconfig b/configs/am57xx_hs_evm_defconfig\nindex 01d77cbbd09e..1047f33237ef 100644\n--- a/configs/am57xx_hs_evm_defconfig\n+++ b/configs/am57xx_hs_evm_defconfig\n@@ -75,7 +75,7 @@ CONFIG_USB_DWC3_OMAP=y\n CONFIG_USB_DWC3_PHY_OMAP=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Texas Instruments\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0451\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xd022\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Texas Instruments\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0451\n-CONFIG_G_DNL_PRODUCT_NUM=0xd022\ndiff --git a/configs/apalis-tk1_defconfig b/configs/apalis-tk1_defconfig\nindex e6e3a9bfe932..84e010649115 100644\n--- a/configs/apalis-tk1_defconfig\n+++ b/configs/apalis-tk1_defconfig\n@@ -47,9 +47,9 @@ CONFIG_DM_USB=y\n CONFIG_USB_EHCI_HCD=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Toradex\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x1b67\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xffff\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Toradex\"\n-CONFIG_G_DNL_VENDOR_NUM=0x1b67\n-CONFIG_G_DNL_PRODUCT_NUM=0xffff\n CONFIG_OF_LIBFDT_OVERLAY=y\ndiff --git a/configs/apalis_imx6_defconfig b/configs/apalis_imx6_defconfig\nindex b2284acc34a3..1ab836389d6e 100644\n--- a/configs/apalis_imx6_defconfig\n+++ b/configs/apalis_imx6_defconfig\n@@ -56,11 +56,11 @@ CONFIG_USB_STORAGE=y\n CONFIG_USB_KEYBOARD=y\n CONFIG_SYS_USB_EVENT_POLL=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Toradex\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x1b67\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x4000\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Toradex\"\n-CONFIG_G_DNL_VENDOR_NUM=0x1b67\n-CONFIG_G_DNL_PRODUCT_NUM=0x4000\n CONFIG_USB_HOST_ETHER=y\n CONFIG_FAT_WRITE=y\n CONFIG_OF_LIBFDT=y\ndiff --git a/configs/apalis_imx6_nospl_com_defconfig b/configs/apalis_imx6_nospl_com_defconfig\nindex 239605dadfaa..3f4f8a500b26 100644\n--- a/configs/apalis_imx6_nospl_com_defconfig\n+++ b/configs/apalis_imx6_nospl_com_defconfig\n@@ -45,11 +45,11 @@ CONFIG_USB_STORAGE=y\n CONFIG_USB_KEYBOARD=y\n CONFIG_SYS_USB_EVENT_POLL=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Toradex\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x1b67\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x4020\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Toradex\"\n-CONFIG_G_DNL_VENDOR_NUM=0x1b67\n-CONFIG_G_DNL_PRODUCT_NUM=0x4020\n CONFIG_USB_HOST_ETHER=y\n CONFIG_FAT_WRITE=y\n CONFIG_OF_LIBFDT=y\ndiff --git a/configs/apalis_imx6_nospl_it_defconfig b/configs/apalis_imx6_nospl_it_defconfig\nindex 1bc05d7266d3..f88dd02a4f9e 100644\n--- a/configs/apalis_imx6_nospl_it_defconfig\n+++ b/configs/apalis_imx6_nospl_it_defconfig\n@@ -45,11 +45,11 @@ CONFIG_USB_STORAGE=y\n CONFIG_USB_KEYBOARD=y\n CONFIG_SYS_USB_EVENT_POLL=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Toradex\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x1b67\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x4020\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Toradex\"\n-CONFIG_G_DNL_VENDOR_NUM=0x1b67\n-CONFIG_G_DNL_PRODUCT_NUM=0x4020\n CONFIG_USB_HOST_ETHER=y\n CONFIG_FAT_WRITE=y\n CONFIG_OF_LIBFDT=y\ndiff --git a/configs/apalis_t30_defconfig b/configs/apalis_t30_defconfig\nindex e15e11ad929a..588c1842a3d3 100644\n--- a/configs/apalis_t30_defconfig\n+++ b/configs/apalis_t30_defconfig\n@@ -40,9 +40,9 @@ CONFIG_DM_USB=y\n CONFIG_USB_EHCI_HCD=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Toradex\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x1b67\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x4000\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Toradex\"\n-CONFIG_G_DNL_VENDOR_NUM=0x1b67\n-CONFIG_G_DNL_PRODUCT_NUM=0x4000\n CONFIG_OF_LIBFDT_OVERLAY=y\ndiff --git a/configs/bcm11130_defconfig b/configs/bcm11130_defconfig\nindex cf3a7cd74d09..4d93975d69aa 100644\n--- a/configs/bcm11130_defconfig\n+++ b/configs/bcm11130_defconfig\n@@ -27,9 +27,9 @@ CONFIG_MMC_SDHCI_KONA=y\n CONFIG_SYS_NS16550=y\n CONFIG_USB=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Broadcom Corporation\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x18d1\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x0d02\n CONFIG_USB_GADGET_DWC2_OTG=y\n CONFIG_USB_GADGET_DWC2_OTG_PHY_BUS_WIDTH_8=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Broadcom Corporation\"\n-CONFIG_G_DNL_VENDOR_NUM=0x18d1\n-CONFIG_G_DNL_PRODUCT_NUM=0x0d02\ndiff --git a/configs/bcm11130_nand_defconfig b/configs/bcm11130_nand_defconfig\nindex 2ce917981ecb..555ff0538216 100644\n--- a/configs/bcm11130_nand_defconfig\n+++ b/configs/bcm11130_nand_defconfig\n@@ -27,9 +27,9 @@ CONFIG_NAND=y\n CONFIG_SYS_NS16550=y\n CONFIG_USB=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Broadcom Corporation\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x18d1\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x0d02\n CONFIG_USB_GADGET_DWC2_OTG=y\n CONFIG_USB_GADGET_DWC2_OTG_PHY_BUS_WIDTH_8=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Broadcom Corporation\"\n-CONFIG_G_DNL_VENDOR_NUM=0x18d1\n-CONFIG_G_DNL_PRODUCT_NUM=0x0d02\ndiff --git a/configs/bcm23550_w1d_defconfig b/configs/bcm23550_w1d_defconfig\nindex 70918654f5ca..49f7e40d15d9 100644\n--- a/configs/bcm23550_w1d_defconfig\n+++ b/configs/bcm23550_w1d_defconfig\n@@ -34,11 +34,11 @@ CONFIG_MMC_SDHCI_KONA=y\n CONFIG_SYS_NS16550=y\n CONFIG_USB=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Broadcom Corporation\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x18d1\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x0d02\n CONFIG_USB_GADGET_BCM_UDC_OTG_PHY=y\n CONFIG_USB_GADGET_DWC2_OTG=y\n CONFIG_USB_GADGET_DWC2_OTG_PHY_BUS_WIDTH_8=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Broadcom Corporation\"\n-CONFIG_G_DNL_VENDOR_NUM=0x18d1\n-CONFIG_G_DNL_PRODUCT_NUM=0x0d02\n CONFIG_OF_LIBFDT=y\ndiff --git a/configs/bcm28155_ap_defconfig b/configs/bcm28155_ap_defconfig\nindex db1ad401324f..9e17b60e54e4 100644\n--- a/configs/bcm28155_ap_defconfig\n+++ b/configs/bcm28155_ap_defconfig\n@@ -35,11 +35,11 @@ CONFIG_MMC_SDHCI_KONA=y\n CONFIG_SYS_NS16550=y\n CONFIG_USB=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Broadcom Corporation\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x18d1\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x0d02\n CONFIG_USB_GADGET_BCM_UDC_OTG_PHY=y\n CONFIG_USB_GADGET_DWC2_OTG=y\n CONFIG_USB_GADGET_DWC2_OTG_PHY_BUS_WIDTH_8=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Broadcom Corporation\"\n-CONFIG_G_DNL_VENDOR_NUM=0x18d1\n-CONFIG_G_DNL_PRODUCT_NUM=0x0d02\n CONFIG_OF_LIBFDT=y\ndiff --git a/configs/bcm28155_w1d_defconfig b/configs/bcm28155_w1d_defconfig\nindex 3684fae37005..8f8668ba5b74 100644\n--- a/configs/bcm28155_w1d_defconfig\n+++ b/configs/bcm28155_w1d_defconfig\n@@ -29,9 +29,9 @@ CONFIG_BCM_SF2_ETH_GMAC=y\n CONFIG_SYS_NS16550=y\n CONFIG_USB=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Broadcom Corporation\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x18d1\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x0d02\n CONFIG_USB_GADGET_DWC2_OTG=y\n CONFIG_USB_GADGET_DWC2_OTG_PHY_BUS_WIDTH_8=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Broadcom Corporation\"\n-CONFIG_G_DNL_VENDOR_NUM=0x18d1\n-CONFIG_G_DNL_PRODUCT_NUM=0x0d02\ndiff --git a/configs/beaver_defconfig b/configs/beaver_defconfig\nindex 7fb88e452b99..ad26354b4df9 100644\n--- a/configs/beaver_defconfig\n+++ b/configs/beaver_defconfig\n@@ -45,10 +45,10 @@ CONFIG_DM_USB=y\n CONFIG_USB_EHCI_HCD=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"NVIDIA\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0955\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x701a\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"NVIDIA\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0955\n-CONFIG_G_DNL_PRODUCT_NUM=0x701a\n CONFIG_USB_HOST_ETHER=y\n CONFIG_USB_ETHER_ASIX=y\ndiff --git a/configs/birdland_bav335a_defconfig b/configs/birdland_bav335a_defconfig\nindex 44f4eac6f63b..41b77302155f 100644\n--- a/configs/birdland_bav335a_defconfig\n+++ b/configs/birdland_bav335a_defconfig\n@@ -66,10 +66,10 @@ CONFIG_USB_MUSB_HOST=y\n CONFIG_USB_MUSB_GADGET=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Texas Instruments\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0451\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xd022\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Texas Instruments\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0451\n-CONFIG_G_DNL_PRODUCT_NUM=0xd022\n CONFIG_FAT_WRITE=y\n CONFIG_LZO=y\n CONFIG_OF_LIBFDT=y\ndiff --git a/configs/birdland_bav335b_defconfig b/configs/birdland_bav335b_defconfig\nindex 1dffd1a1950d..6ecf8d035478 100644\n--- a/configs/birdland_bav335b_defconfig\n+++ b/configs/birdland_bav335b_defconfig\n@@ -66,10 +66,10 @@ CONFIG_USB_MUSB_HOST=y\n CONFIG_USB_MUSB_GADGET=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Texas Instruments\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0451\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xd022\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Texas Instruments\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0451\n-CONFIG_G_DNL_PRODUCT_NUM=0xd022\n CONFIG_FAT_WRITE=y\n CONFIG_LZO=y\n CONFIG_OF_LIBFDT=y\ndiff --git a/configs/cei-tk1-som_defconfig b/configs/cei-tk1-som_defconfig\nindex 91b5647e6436..a4cd2701e14f 100644\n--- a/configs/cei-tk1-som_defconfig\n+++ b/configs/cei-tk1-som_defconfig\n@@ -48,10 +48,10 @@ CONFIG_DM_USB=y\n CONFIG_USB_EHCI_HCD=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"NVIDIA\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0955\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x701a\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"NVIDIA\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0955\n-CONFIG_G_DNL_PRODUCT_NUM=0x701a\n CONFIG_USB_HOST_ETHER=y\n CONFIG_USB_ETHER_ASIX=y\ndiff --git a/configs/cgtqmx6eval_defconfig b/configs/cgtqmx6eval_defconfig\nindex fc336103cf2b..b17c30fcd2f6 100644\n--- a/configs/cgtqmx6eval_defconfig\n+++ b/configs/cgtqmx6eval_defconfig\n@@ -57,11 +57,11 @@ CONFIG_USB_STORAGE=y\n CONFIG_USB_KEYBOARD=y\n CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Congatec\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0525\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Congatec\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0525\n-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5\n CONFIG_USB_HOST_ETHER=y\n CONFIG_USB_ETHER_ASIX=y\n # CONFIG_VIDEO_SW_CURSOR is not set\ndiff --git a/configs/chromebit_mickey_defconfig b/configs/chromebit_mickey_defconfig\nindex f40c0b9afa7d..fccff80780bc 100644\n--- a/configs/chromebit_mickey_defconfig\n+++ b/configs/chromebit_mickey_defconfig\n@@ -75,11 +75,11 @@ CONFIG_ROCKCHIP_SPI=y\n CONFIG_SYSRESET=y\n CONFIG_USB=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Rockchip\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x2207\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x320a\n CONFIG_USB_GADGET_DWC2_OTG=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Rockchip\"\n-CONFIG_G_DNL_VENDOR_NUM=0x2207\n-CONFIG_G_DNL_PRODUCT_NUM=0x320a\n CONFIG_DM_VIDEO=y\n CONFIG_DISPLAY=y\n CONFIG_VIDEO_ROCKCHIP=y\ndiff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig\nindex cdeabaa12aa6..18790b30898f 100644\n--- a/configs/chromebook_jerry_defconfig\n+++ b/configs/chromebook_jerry_defconfig\n@@ -76,11 +76,11 @@ CONFIG_ROCKCHIP_SPI=y\n CONFIG_SYSRESET=y\n CONFIG_USB=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Rockchip\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x2207\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x320a\n CONFIG_USB_GADGET_DWC2_OTG=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Rockchip\"\n-CONFIG_G_DNL_VENDOR_NUM=0x2207\n-CONFIG_G_DNL_PRODUCT_NUM=0x320a\n CONFIG_DM_VIDEO=y\n CONFIG_DISPLAY=y\n CONFIG_VIDEO_ROCKCHIP=y\ndiff --git a/configs/chromebook_minnie_defconfig b/configs/chromebook_minnie_defconfig\nindex c1e36fa8601d..fdb992d59252 100644\n--- a/configs/chromebook_minnie_defconfig\n+++ b/configs/chromebook_minnie_defconfig\n@@ -75,11 +75,11 @@ CONFIG_ROCKCHIP_SPI=y\n CONFIG_SYSRESET=y\n CONFIG_USB=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Rockchip\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x2207\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x320a\n CONFIG_USB_GADGET_DWC2_OTG=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Rockchip\"\n-CONFIG_G_DNL_VENDOR_NUM=0x2207\n-CONFIG_G_DNL_PRODUCT_NUM=0x320a\n CONFIG_DM_VIDEO=y\n CONFIG_DISPLAY=y\n CONFIG_VIDEO_ROCKCHIP=y\ndiff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig\nindex 7d1e709d4c47..600387aed428 100644\n--- a/configs/colibri_imx6_defconfig\n+++ b/configs/colibri_imx6_defconfig\n@@ -54,11 +54,11 @@ CONFIG_USB_STORAGE=y\n CONFIG_USB_KEYBOARD=y\n CONFIG_SYS_USB_EVENT_POLL=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Toradex\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x1b67\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x4000\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Toradex\"\n-CONFIG_G_DNL_VENDOR_NUM=0x1b67\n-CONFIG_G_DNL_PRODUCT_NUM=0x4000\n CONFIG_USB_HOST_ETHER=y\n CONFIG_FAT_WRITE=y\n CONFIG_OF_LIBFDT=y\ndiff --git a/configs/colibri_imx6_nospl_defconfig b/configs/colibri_imx6_nospl_defconfig\nindex 6877993088f4..2e69195cc6c9 100644\n--- a/configs/colibri_imx6_nospl_defconfig\n+++ b/configs/colibri_imx6_nospl_defconfig\n@@ -43,11 +43,11 @@ CONFIG_USB_STORAGE=y\n CONFIG_USB_KEYBOARD=y\n CONFIG_SYS_USB_EVENT_POLL=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Toradex\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x1b67\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x4000\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Toradex\"\n-CONFIG_G_DNL_VENDOR_NUM=0x1b67\n-CONFIG_G_DNL_PRODUCT_NUM=0x4000\n CONFIG_USB_HOST_ETHER=y\n CONFIG_FAT_WRITE=y\n CONFIG_OF_LIBFDT=y\ndiff --git a/configs/colibri_imx7_defconfig b/configs/colibri_imx7_defconfig\nindex d0b6c6814631..56ae86799140 100644\n--- a/configs/colibri_imx7_defconfig\n+++ b/configs/colibri_imx7_defconfig\n@@ -56,10 +56,10 @@ CONFIG_USB=y\n CONFIG_USB_EHCI_HCD=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Toradex\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x1b67\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x4000\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Toradex\"\n-CONFIG_G_DNL_VENDOR_NUM=0x1b67\n-CONFIG_G_DNL_PRODUCT_NUM=0x4000\n CONFIG_OF_LIBFDT_OVERLAY=y\n CONFIG_FDT_FIXUP_PARTITIONS=y\ndiff --git a/configs/colibri_t20_defconfig b/configs/colibri_t20_defconfig\nindex 0b5604c85158..786d50b458b3 100644\n--- a/configs/colibri_t20_defconfig\n+++ b/configs/colibri_t20_defconfig\n@@ -47,11 +47,11 @@ CONFIG_USB_ULPI_VIEWPORT=y\n CONFIG_USB_ULPI=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Toradex\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x1b67\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x4000\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Toradex\"\n-CONFIG_G_DNL_VENDOR_NUM=0x1b67\n-CONFIG_G_DNL_PRODUCT_NUM=0x4000\n CONFIG_USB_HOST_ETHER=y\n CONFIG_USB_ETHER_ASIX=y\n CONFIG_DM_VIDEO=y\ndiff --git a/configs/colibri_t30_defconfig b/configs/colibri_t30_defconfig\nindex 65fa90fa2909..1601aa6bc6bf 100644\n--- a/configs/colibri_t30_defconfig\n+++ b/configs/colibri_t30_defconfig\n@@ -34,11 +34,11 @@ CONFIG_DM_USB=y\n CONFIG_USB_EHCI_HCD=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Toradex\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x1b67\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x4000\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Toradex\"\n-CONFIG_G_DNL_VENDOR_NUM=0x1b67\n-CONFIG_G_DNL_PRODUCT_NUM=0x4000\n CONFIG_USB_HOST_ETHER=y\n CONFIG_USB_ETHER_ASIX=y\n CONFIG_OF_LIBFDT_OVERLAY=y\ndiff --git a/configs/colibri_vf_defconfig b/configs/colibri_vf_defconfig\nindex 1ffe86180974..c0d664ec2fcd 100644\n--- a/configs/colibri_vf_defconfig\n+++ b/configs/colibri_vf_defconfig\n@@ -53,11 +53,11 @@ CONFIG_DM_USB=y\n CONFIG_USB_EHCI_HCD=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Toradex\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x1b67\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x4000\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Toradex\"\n-CONFIG_G_DNL_VENDOR_NUM=0x1b67\n-CONFIG_G_DNL_PRODUCT_NUM=0x4000\n CONFIG_VIDEO_FSL_DCU_FB=y\n CONFIG_SYS_CONSOLE_FG_COL=0x00\n CONFIG_OF_LIBFDT_OVERLAY=y\ndiff --git a/configs/corvus_defconfig b/configs/corvus_defconfig\nindex 705e00145700..066dc38535d0 100644\n--- a/configs/corvus_defconfig\n+++ b/configs/corvus_defconfig\n@@ -49,9 +49,9 @@ CONFIG_USB=y\n CONFIG_USB_EHCI_HCD=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Siemens AG\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0908\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x02d2\n CONFIG_USB_GADGET_ATMEL_USBA=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Siemens AG\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0908\n-CONFIG_G_DNL_PRODUCT_NUM=0x02d2\n # CONFIG_EFI_LOADER is not set\ndiff --git a/configs/dalmore_defconfig b/configs/dalmore_defconfig\nindex ba3d478b1e7b..caf998be99cc 100644\n--- a/configs/dalmore_defconfig\n+++ b/configs/dalmore_defconfig\n@@ -39,10 +39,10 @@ CONFIG_DM_USB=y\n CONFIG_USB_EHCI_HCD=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"NVIDIA\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0955\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x701a\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"NVIDIA\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0955\n-CONFIG_G_DNL_PRODUCT_NUM=0x701a\n CONFIG_USB_HOST_ETHER=y\n CONFIG_USB_ETHER_ASIX=y\ndiff --git a/configs/dms-ba16-1g_defconfig b/configs/dms-ba16-1g_defconfig\nindex 2342f34e7885..352ab04c8ba3 100644\n--- a/configs/dms-ba16-1g_defconfig\n+++ b/configs/dms-ba16-1g_defconfig\n@@ -38,10 +38,10 @@ CONFIG_USB_STORAGE=y\n CONFIG_USB_KEYBOARD=y\n CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Advantech\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0525\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Advantech\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0525\n-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5\n # CONFIG_VIDEO_SW_CURSOR is not set\n CONFIG_OF_LIBFDT=y\ndiff --git a/configs/dms-ba16_defconfig b/configs/dms-ba16_defconfig\nindex 08d96add3b93..8a38c8d8c4c9 100644\n--- a/configs/dms-ba16_defconfig\n+++ b/configs/dms-ba16_defconfig\n@@ -37,10 +37,10 @@ CONFIG_USB_STORAGE=y\n CONFIG_USB_KEYBOARD=y\n CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Advantech\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0525\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Advantech\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0525\n-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5\n # CONFIG_VIDEO_SW_CURSOR is not set\n CONFIG_OF_LIBFDT=y\ndiff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig\nindex e4bb299275d9..4aca3a4a043a 100644\n--- a/configs/dra7xx_evm_defconfig\n+++ b/configs/dra7xx_evm_defconfig\n@@ -90,7 +90,7 @@ CONFIG_USB_DWC3_OMAP=y\n CONFIG_USB_DWC3_PHY_OMAP=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Texas Instruments\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0451\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xd022\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Texas Instruments\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0451\n-CONFIG_G_DNL_PRODUCT_NUM=0xd022\ndiff --git a/configs/dra7xx_hs_evm_defconfig b/configs/dra7xx_hs_evm_defconfig\nindex f55fc501aa48..4d126e09f6a6 100644\n--- a/configs/dra7xx_hs_evm_defconfig\n+++ b/configs/dra7xx_hs_evm_defconfig\n@@ -92,7 +92,7 @@ CONFIG_USB_DWC3_OMAP=y\n CONFIG_USB_DWC3_PHY_OMAP=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Texas Instruments\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0451\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xd022\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Texas Instruments\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0451\n-CONFIG_G_DNL_PRODUCT_NUM=0xd022\ndiff --git a/configs/draco_defconfig b/configs/draco_defconfig\nindex e38030bf5913..de2961bfb9c7 100644\n--- a/configs/draco_defconfig\n+++ b/configs/draco_defconfig\n@@ -66,8 +66,8 @@ CONFIG_USB_MUSB_HOST=y\n CONFIG_USB_MUSB_GADGET=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Siemens AG\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0908\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x02d2\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Siemens AG\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0908\n-CONFIG_G_DNL_PRODUCT_NUM=0x02d2\n CONFIG_USB_ETHER=y\ndiff --git a/configs/e2220-1170_defconfig b/configs/e2220-1170_defconfig\nindex 41248189e3e4..267051228623 100644\n--- a/configs/e2220-1170_defconfig\n+++ b/configs/e2220-1170_defconfig\n@@ -35,8 +35,8 @@ CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"NVIDIA\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0955\n-CONFIG_G_DNL_PRODUCT_NUM=0x701a\n+CONFIG_USB_GADGET_MANUFACTURER=\"NVIDIA\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0955\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x701a\n CONFIG_USB_HOST_ETHER=y\n CONFIG_USB_ETHER_ASIX=y\ndiff --git a/configs/edison_defconfig b/configs/edison_defconfig\nindex d58700c204cb..d3b67c336f47 100644\n--- a/configs/edison_defconfig\n+++ b/configs/edison_defconfig\n@@ -33,9 +33,9 @@ CONFIG_DM_PCI_COMPAT=y\n CONFIG_USB_DWC3_GADGET=y\n CONFIG_USB_GADGET=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Intel\"\n-CONFIG_G_DNL_VENDOR_NUM=0x8087\n-CONFIG_G_DNL_PRODUCT_NUM=0x0a99\n+CONFIG_USB_GADGET_MANUFACTURER=\"Intel\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x8087\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x0a99\n # CONFIG_USB_HOST_ETHER is not set\n CONFIG_FAT_WRITE=y\n CONFIG_SHA1=y\ndiff --git a/configs/etamin_defconfig b/configs/etamin_defconfig\nindex 33ca6858abfd..70559892b6e3 100644\n--- a/configs/etamin_defconfig\n+++ b/configs/etamin_defconfig\n@@ -66,8 +66,8 @@ CONFIG_USB_MUSB_HOST=y\n CONFIG_USB_MUSB_GADGET=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Siemens AG\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0908\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x02d2\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Siemens AG\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0908\n-CONFIG_G_DNL_PRODUCT_NUM=0x02d2\n CONFIG_USB_ETHER=y\ndiff --git a/configs/evb-rk3036_defconfig b/configs/evb-rk3036_defconfig\nindex 5a53951314e2..9cce3351f80b 100644\n--- a/configs/evb-rk3036_defconfig\n+++ b/configs/evb-rk3036_defconfig\n@@ -44,11 +44,11 @@ CONFIG_DEBUG_UART_SHIFT=2\n CONFIG_SYSRESET=y\n CONFIG_USB=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Rockchip\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x2207\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x310a\n CONFIG_USB_GADGET_DWC2_OTG=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Rockchip\"\n-CONFIG_G_DNL_VENDOR_NUM=0x2207\n-CONFIG_G_DNL_PRODUCT_NUM=0x310a\n CONFIG_SPL_TINY_MEMSET=y\n CONFIG_CMD_DHRYSTONE=y\n CONFIG_ERRNO_STR=y\ndiff --git a/configs/evb-rk3229_defconfig b/configs/evb-rk3229_defconfig\nindex 5a658a149522..61fdacaa1340 100644\n--- a/configs/evb-rk3229_defconfig\n+++ b/configs/evb-rk3229_defconfig\n@@ -44,9 +44,9 @@ CONFIG_SYS_NS16550=y\n CONFIG_SYSRESET=y\n CONFIG_USB=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Rockchip\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x2207\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x320a\n CONFIG_USB_GADGET_DWC2_OTG=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Rockchip\"\n-CONFIG_G_DNL_VENDOR_NUM=0x2207\n-CONFIG_G_DNL_PRODUCT_NUM=0x320a\n CONFIG_ERRNO_STR=y\ndiff --git a/configs/evb-rk3288_defconfig b/configs/evb-rk3288_defconfig\nindex 5294ba9f5feb..0d91cdd53ff6 100644\n--- a/configs/evb-rk3288_defconfig\n+++ b/configs/evb-rk3288_defconfig\n@@ -66,11 +66,11 @@ CONFIG_SYS_NS16550=y\n CONFIG_SYSRESET=y\n CONFIG_USB=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Rockchip\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x2207\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x320a\n CONFIG_USB_GADGET_DWC2_OTG=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Rockchip\"\n-CONFIG_G_DNL_VENDOR_NUM=0x2207\n-CONFIG_G_DNL_PRODUCT_NUM=0x320a\n CONFIG_DM_VIDEO=y\n CONFIG_DISPLAY=y\n CONFIG_VIDEO_ROCKCHIP=y\ndiff --git a/configs/evb-rk3328_defconfig b/configs/evb-rk3328_defconfig\nindex 7bec00178692..e3999556d8b2 100644\n--- a/configs/evb-rk3328_defconfig\n+++ b/configs/evb-rk3328_defconfig\n@@ -47,8 +47,8 @@ CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n CONFIG_USB_GADGET_DWC2_OTG=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Rockchip\"\n-CONFIG_G_DNL_VENDOR_NUM=0x2207\n-CONFIG_G_DNL_PRODUCT_NUM=0x330a\n+CONFIG_USB_GADGET_MANUFACTURER=\"Rockchip\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x2207\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x330a\n CONFIG_USE_TINY_PRINTF=y\n CONFIG_ERRNO_STR=y\ndiff --git a/configs/fennec-rk3288_defconfig b/configs/fennec-rk3288_defconfig\nindex 96a07defce64..51420e5b66db 100644\n--- a/configs/fennec-rk3288_defconfig\n+++ b/configs/fennec-rk3288_defconfig\n@@ -69,11 +69,11 @@ CONFIG_USB=y\n CONFIG_USB_DWC2=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Rockchip\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x2207\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x320a\n CONFIG_USB_GADGET_DWC2_OTG=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Rockchip\"\n-CONFIG_G_DNL_VENDOR_NUM=0x2207\n-CONFIG_G_DNL_PRODUCT_NUM=0x320a\n CONFIG_USB_HOST_ETHER=y\n CONFIG_USB_ETHER_ASIX=y\n CONFIG_USB_ETHER_SMSC95XX=y\ndiff --git a/configs/firefly-rk3288_defconfig b/configs/firefly-rk3288_defconfig\nindex 82da6016e654..eb42def73fc2 100644\n--- a/configs/firefly-rk3288_defconfig\n+++ b/configs/firefly-rk3288_defconfig\n@@ -75,11 +75,11 @@ CONFIG_USB_STORAGE=y\n CONFIG_USB_KEYBOARD=y\n CONFIG_SYS_USB_EVENT_POLL=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Rockchip\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x2207\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x320a\n CONFIG_USB_GADGET_DWC2_OTG=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Rockchip\"\n-CONFIG_G_DNL_VENDOR_NUM=0x2207\n-CONFIG_G_DNL_PRODUCT_NUM=0x320a\n CONFIG_USB_HOST_ETHER=y\n CONFIG_USB_ETHER_ASIX=y\n CONFIG_USB_ETHER_SMSC95XX=y\ndiff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig\nindex 03d732d8f11e..eeb795876f2c 100644\n--- a/configs/gwventana_emmc_defconfig\n+++ b/configs/gwventana_emmc_defconfig\n@@ -63,11 +63,11 @@ CONFIG_USB_STORAGE=y\n CONFIG_USB_KEYBOARD=y\n CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Gateworks\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0525\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Gateworks\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0525\n-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5\n CONFIG_USB_ETHER=y\n CONFIG_USB_ETH_CDC=y\n CONFIG_USB_HOST_ETHER=y\ndiff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig\nindex 51aa13dbaca3..75a07c587400 100644\n--- a/configs/gwventana_gw5904_defconfig\n+++ b/configs/gwventana_gw5904_defconfig\n@@ -67,11 +67,11 @@ CONFIG_USB_STORAGE=y\n CONFIG_USB_KEYBOARD=y\n CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Gateworks\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0525\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Gateworks\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0525\n-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5\n CONFIG_USB_ETHER=y\n CONFIG_USB_ETH_CDC=y\n CONFIG_USB_HOST_ETHER=y\ndiff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig\nindex 4b2e1a752935..1819b9f09d14 100644\n--- a/configs/gwventana_nand_defconfig\n+++ b/configs/gwventana_nand_defconfig\n@@ -66,11 +66,11 @@ CONFIG_USB_STORAGE=y\n CONFIG_USB_KEYBOARD=y\n CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Gateworks\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0525\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Gateworks\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0525\n-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5\n CONFIG_USB_ETHER=y\n CONFIG_USB_ETH_CDC=y\n CONFIG_USB_HOST_ETHER=y\ndiff --git a/configs/jetson-tk1_defconfig b/configs/jetson-tk1_defconfig\nindex 1e3e4bed6af2..f40f6ae56f53 100644\n--- a/configs/jetson-tk1_defconfig\n+++ b/configs/jetson-tk1_defconfig\n@@ -49,10 +49,10 @@ CONFIG_DM_USB=y\n CONFIG_USB_EHCI_HCD=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"NVIDIA\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0955\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x701a\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"NVIDIA\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0955\n-CONFIG_G_DNL_PRODUCT_NUM=0x701a\n CONFIG_USB_HOST_ETHER=y\n CONFIG_USB_ETHER_ASIX=y\ndiff --git a/configs/kc1_defconfig b/configs/kc1_defconfig\nindex d9c2efcf7cbe..d27a7f5abbe0 100644\n--- a/configs/kc1_defconfig\n+++ b/configs/kc1_defconfig\n@@ -42,8 +42,8 @@ CONFIG_SYS_NS16550=y\n CONFIG_USB=y\n CONFIG_USB_MUSB_GADGET=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Texas Instruments\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0451\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xd022\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Texas Instruments\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0451\n-CONFIG_G_DNL_PRODUCT_NUM=0xd022\n CONFIG_OF_LIBFDT=y\ndiff --git a/configs/kylin-rk3036_defconfig b/configs/kylin-rk3036_defconfig\nindex a42f5e0efb40..0904eb14d4fc 100644\n--- a/configs/kylin-rk3036_defconfig\n+++ b/configs/kylin-rk3036_defconfig\n@@ -44,11 +44,11 @@ CONFIG_USB=y\n CONFIG_USB_DWC2=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Rockchip\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x2207\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x310a\n CONFIG_USB_GADGET_DWC2_OTG=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Rockchip\"\n-CONFIG_G_DNL_VENDOR_NUM=0x2207\n-CONFIG_G_DNL_PRODUCT_NUM=0x310a\n CONFIG_USB_HOST_ETHER=y\n CONFIG_USB_ETHER_ASIX=y\n CONFIG_USB_ETHER_SMSC95XX=y\ndiff --git a/configs/ma5d4evk_defconfig b/configs/ma5d4evk_defconfig\nindex 0655505a1321..43ab70416331 100644\n--- a/configs/ma5d4evk_defconfig\n+++ b/configs/ma5d4evk_defconfig\n@@ -47,11 +47,11 @@ CONFIG_USB=y\n CONFIG_USB_EHCI_HCD=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"AriesEmbedded\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0525\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5\n CONFIG_USB_GADGET_ATMEL_USBA=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"AriesEmbedded\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0525\n-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5\n CONFIG_USB_ETHER=y\n CONFIG_FAT_WRITE=y\n CONFIG_OF_LIBFDT=y\ndiff --git a/configs/miqi-rk3288_defconfig b/configs/miqi-rk3288_defconfig\nindex b0437e13a7a7..e607ecd7dd71 100644\n--- a/configs/miqi-rk3288_defconfig\n+++ b/configs/miqi-rk3288_defconfig\n@@ -69,11 +69,11 @@ CONFIG_USB=y\n CONFIG_USB_DWC2=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Rockchip\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x2207\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x320a\n CONFIG_USB_GADGET_DWC2_OTG=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Rockchip\"\n-CONFIG_G_DNL_VENDOR_NUM=0x2207\n-CONFIG_G_DNL_PRODUCT_NUM=0x320a\n CONFIG_USB_HOST_ETHER=y\n CONFIG_USB_ETHER_ASIX=y\n CONFIG_USB_ETHER_SMSC95XX=y\ndiff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig\nindex f716c8fd7f77..92e0a578dfde 100644\n--- a/configs/mx6qsabrelite_defconfig\n+++ b/configs/mx6qsabrelite_defconfig\n@@ -49,11 +49,11 @@ CONFIG_USB_STORAGE=y\n CONFIG_USB_KEYBOARD=y\n CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Boundary\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0525\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Boundary\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0525\n-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5\n CONFIG_USB_ETHER=y\n CONFIG_USB_ETH_CDC=y\n # CONFIG_VIDEO_SW_CURSOR is not set\ndiff --git a/configs/mx6sabreauto_defconfig b/configs/mx6sabreauto_defconfig\nindex 828318931560..2e375c3068f8 100644\n--- a/configs/mx6sabreauto_defconfig\n+++ b/configs/mx6sabreauto_defconfig\n@@ -48,11 +48,11 @@ CONFIG_PHYLIB=y\n CONFIG_USB=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"FSL\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0525\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"FSL\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0525\n-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5\n CONFIG_USB_HOST_ETHER=y\n CONFIG_USB_ETHER_ASIX=y\n # CONFIG_VIDEO_SW_CURSOR is not set\ndiff --git a/configs/mx6sabresd_defconfig b/configs/mx6sabresd_defconfig\nindex 0e49e69c8cd5..d511fc98b906 100644\n--- a/configs/mx6sabresd_defconfig\n+++ b/configs/mx6sabresd_defconfig\n@@ -48,11 +48,11 @@ CONFIG_PCI=y\n CONFIG_USB=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"FSL\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0525\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"FSL\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0525\n-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5\n CONFIG_USB_HOST_ETHER=y\n CONFIG_USB_ETHER_ASIX=y\n # CONFIG_VIDEO_SW_CURSOR is not set\ndiff --git a/configs/mx7dsabresd_defconfig b/configs/mx7dsabresd_defconfig\nindex 795c4f2b7124..26250fdb5e91 100644\n--- a/configs/mx7dsabresd_defconfig\n+++ b/configs/mx7dsabresd_defconfig\n@@ -64,11 +64,11 @@ CONFIG_USB_EHCI_HCD=y\n CONFIG_MXC_USB_OTG_HACTIVE=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"FSL\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0525\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"FSL\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0525\n-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5\n CONFIG_USB_HOST_ETHER=y\n CONFIG_USB_ETHER_ASIX=y\n CONFIG_ERRNO_STR=y\ndiff --git a/configs/mx7dsabresd_secure_defconfig b/configs/mx7dsabresd_secure_defconfig\nindex bd68831db7cc..970f8211ef2c 100644\n--- a/configs/mx7dsabresd_secure_defconfig\n+++ b/configs/mx7dsabresd_secure_defconfig\n@@ -66,11 +66,11 @@ CONFIG_USB_EHCI_HCD=y\n CONFIG_MXC_USB_OTG_HACTIVE=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"FSL\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0525\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"FSL\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0525\n-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5\n CONFIG_USB_HOST_ETHER=y\n CONFIG_USB_ETHER_ASIX=y\n CONFIG_ERRNO_STR=y\ndiff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig\nindex fd4a46558129..a5fdb48d2452 100644\n--- a/configs/nitrogen6dl2g_defconfig\n+++ b/configs/nitrogen6dl2g_defconfig\n@@ -46,11 +46,11 @@ CONFIG_USB_STORAGE=y\n CONFIG_USB_KEYBOARD=y\n CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Boundary\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0525\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Boundary\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0525\n-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5\n CONFIG_USB_ETHER=y\n CONFIG_USB_ETH_CDC=y\n # CONFIG_VIDEO_SW_CURSOR is not set\ndiff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig\nindex 30046e3f3a07..1803bdba888e 100644\n--- a/configs/nitrogen6dl_defconfig\n+++ b/configs/nitrogen6dl_defconfig\n@@ -46,11 +46,11 @@ CONFIG_USB_STORAGE=y\n CONFIG_USB_KEYBOARD=y\n CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Boundary\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0525\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Boundary\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0525\n-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5\n CONFIG_USB_ETHER=y\n CONFIG_USB_ETH_CDC=y\n # CONFIG_VIDEO_SW_CURSOR is not set\ndiff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig\nindex f9160c208fe7..3c9b44023f82 100644\n--- a/configs/nitrogen6q2g_defconfig\n+++ b/configs/nitrogen6q2g_defconfig\n@@ -47,11 +47,11 @@ CONFIG_USB_STORAGE=y\n CONFIG_USB_KEYBOARD=y\n CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Boundary\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0525\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Boundary\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0525\n-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5\n CONFIG_USB_ETHER=y\n CONFIG_USB_ETH_CDC=y\n # CONFIG_VIDEO_SW_CURSOR is not set\ndiff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig\nindex 8bca0e04439e..82b05febae40 100644\n--- a/configs/nitrogen6q_defconfig\n+++ b/configs/nitrogen6q_defconfig\n@@ -47,11 +47,11 @@ CONFIG_USB_STORAGE=y\n CONFIG_USB_KEYBOARD=y\n CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Boundary\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0525\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Boundary\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0525\n-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5\n CONFIG_USB_ETHER=y\n CONFIG_USB_ETH_CDC=y\n # CONFIG_VIDEO_SW_CURSOR is not set\ndiff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig\nindex 668fbaa37010..3e4c20357c16 100644\n--- a/configs/nitrogen6s1g_defconfig\n+++ b/configs/nitrogen6s1g_defconfig\n@@ -46,11 +46,11 @@ CONFIG_USB_STORAGE=y\n CONFIG_USB_KEYBOARD=y\n CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Boundary\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0525\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Boundary\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0525\n-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5\n CONFIG_USB_ETHER=y\n CONFIG_USB_ETH_CDC=y\n # CONFIG_VIDEO_SW_CURSOR is not set\ndiff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig\nindex 99106c9a1f5a..107cbfc9bc55 100644\n--- a/configs/nitrogen6s_defconfig\n+++ b/configs/nitrogen6s_defconfig\n@@ -46,11 +46,11 @@ CONFIG_USB_STORAGE=y\n CONFIG_USB_KEYBOARD=y\n CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Boundary\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0525\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Boundary\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0525\n-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5\n CONFIG_USB_ETHER=y\n CONFIG_USB_ETH_CDC=y\n # CONFIG_VIDEO_SW_CURSOR is not set\ndiff --git a/configs/nyan-big_defconfig b/configs/nyan-big_defconfig\nindex 29d918d974e4..ba9d8f545ccc 100644\n--- a/configs/nyan-big_defconfig\n+++ b/configs/nyan-big_defconfig\n@@ -65,11 +65,11 @@ CONFIG_DM_USB=y\n CONFIG_USB_EHCI_HCD=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"NVIDIA\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0955\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x701a\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"NVIDIA\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0955\n-CONFIG_G_DNL_PRODUCT_NUM=0x701a\n CONFIG_USB_HOST_ETHER=y\n CONFIG_USB_ETHER_ASIX=y\n CONFIG_DM_VIDEO=y\ndiff --git a/configs/odroid-xu3_defconfig b/configs/odroid-xu3_defconfig\nindex a5e47c84f248..ab7f8bde9dd7 100644\n--- a/configs/odroid-xu3_defconfig\n+++ b/configs/odroid-xu3_defconfig\n@@ -43,10 +43,10 @@ CONFIG_USB_DWC3_GADGET=y\n CONFIG_USB_DWC3_PHY_SAMSUNG=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Samsung\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x04e8\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x6601\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Samsung\"\n-CONFIG_G_DNL_VENDOR_NUM=0x04e8\n-CONFIG_G_DNL_PRODUCT_NUM=0x6601\n CONFIG_USB_HOST_ETHER=y\n CONFIG_VIDEO_BRIDGE=y\n CONFIG_ERRNO_STR=y\ndiff --git a/configs/odroid_defconfig b/configs/odroid_defconfig\nindex 0dc1a250c5d0..ddac08cb98fd 100644\n--- a/configs/odroid_defconfig\n+++ b/configs/odroid_defconfig\n@@ -56,11 +56,11 @@ CONFIG_DM_USB=y\n CONFIG_USB_EHCI_HCD=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Samsung\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x04e8\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x6601\n CONFIG_USB_GADGET_DWC2_OTG=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Samsung\"\n-CONFIG_G_DNL_VENDOR_NUM=0x04e8\n-CONFIG_G_DNL_PRODUCT_NUM=0x6601\n CONFIG_USB_HOST_ETHER=y\n CONFIG_USB_ETHER_SMSC95XX=y\n CONFIG_ERRNO_STR=y\ndiff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig\nindex 8896b84ebc9a..86967b07fb9c 100644\n--- a/configs/omap3_beagle_defconfig\n+++ b/configs/omap3_beagle_defconfig\n@@ -48,10 +48,10 @@ CONFIG_USB_EHCI_HCD=y\n CONFIG_USB_MUSB_GADGET=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"TI\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0451\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xd022\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"TI\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0451\n-CONFIG_G_DNL_PRODUCT_NUM=0xd022\n CONFIG_USB_ETHER=y\n CONFIG_USB_HOST_ETHER=y\n CONFIG_USB_ETHER_ASIX=y\ndiff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig\nindex 8db95f167a1a..5f6067e689d0 100644\n--- a/configs/omap3_evm_defconfig\n+++ b/configs/omap3_evm_defconfig\n@@ -52,10 +52,10 @@ CONFIG_USB=y\n CONFIG_USB_EHCI_HCD=y\n CONFIG_USB_MUSB_GADGET=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Texas Instruments\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0451\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x5678\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Texas Instruments\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0451\n-CONFIG_G_DNL_PRODUCT_NUM=0x5678\n CONFIG_USB_ETHER=y\n CONFIG_FAT_WRITE=y\n CONFIG_BCH=y\ndiff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig\nindex 3bf115e6f8c8..b1693be7edd7 100644\n--- a/configs/omap3_logic_defconfig\n+++ b/configs/omap3_logic_defconfig\n@@ -45,9 +45,9 @@ CONFIG_OMAP3_SPI=y\n CONFIG_USB=y\n CONFIG_USB_MUSB_GADGET=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"TI\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0451\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xd022\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"TI\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0451\n-CONFIG_G_DNL_PRODUCT_NUM=0xd022\n CONFIG_USB_ETHER=y\n CONFIG_BCH=y\ndiff --git a/configs/omap5_uevm_defconfig b/configs/omap5_uevm_defconfig\nindex 6e860ef5e32d..e2295759f0ef 100644\n--- a/configs/omap5_uevm_defconfig\n+++ b/configs/omap5_uevm_defconfig\n@@ -49,10 +49,10 @@ CONFIG_USB_DWC3_OMAP=y\n CONFIG_USB_DWC3_PHY_OMAP=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Texas Instruments\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0403\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xbd00\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Texas Instruments\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0403\n-CONFIG_G_DNL_PRODUCT_NUM=0xbd00\n CONFIG_USB_HOST_ETHER=y\n CONFIG_USB_ETHER_SMSC95XX=y\n CONFIG_FAT_WRITE=y\ndiff --git a/configs/opos6uldev_defconfig b/configs/opos6uldev_defconfig\nindex a880c62eb6ac..0c2319272ac7 100644\n--- a/configs/opos6uldev_defconfig\n+++ b/configs/opos6uldev_defconfig\n@@ -79,10 +79,10 @@ CONFIG_USB=y\n CONFIG_DM_USB=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Armadeus Systems\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0525\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Armadeus Systems\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0525\n-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5\n CONFIG_OF_LIBFDT_OVERLAY=y\n # CONFIG_EFI_LOADER is not set\ndiff --git a/configs/origen_defconfig b/configs/origen_defconfig\nindex 298e7a494371..013eec185aaf 100644\n--- a/configs/origen_defconfig\n+++ b/configs/origen_defconfig\n@@ -41,8 +41,8 @@ CONFIG_MMC_SDHCI_S5P=y\n CONFIG_USB=y\n CONFIG_DM_USB=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Samsung\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x04e8\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x6601\n CONFIG_USB_GADGET_DWC2_OTG=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Samsung\"\n-CONFIG_G_DNL_VENDOR_NUM=0x04e8\n-CONFIG_G_DNL_PRODUCT_NUM=0x6601\ndiff --git a/configs/p2371-0000_defconfig b/configs/p2371-0000_defconfig\nindex e499b82d344f..e186526550ee 100644\n--- a/configs/p2371-0000_defconfig\n+++ b/configs/p2371-0000_defconfig\n@@ -36,8 +36,8 @@ CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"NVIDIA\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0955\n-CONFIG_G_DNL_PRODUCT_NUM=0x701a\n+CONFIG_USB_GADGET_MANUFACTURER=\"NVIDIA\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0955\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x701a\n CONFIG_USB_HOST_ETHER=y\n CONFIG_USB_ETHER_ASIX=y\ndiff --git a/configs/p2371-2180_defconfig b/configs/p2371-2180_defconfig\nindex 3330d23e4089..6713564763d6 100644\n--- a/configs/p2371-2180_defconfig\n+++ b/configs/p2371-2180_defconfig\n@@ -43,8 +43,8 @@ CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"NVIDIA\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0955\n-CONFIG_G_DNL_PRODUCT_NUM=0x701a\n+CONFIG_USB_GADGET_MANUFACTURER=\"NVIDIA\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0955\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x701a\n CONFIG_USB_HOST_ETHER=y\n CONFIG_USB_ETHER_ASIX=y\ndiff --git a/configs/p2571_defconfig b/configs/p2571_defconfig\nindex 9259c1316e27..ae896bdde6ff 100644\n--- a/configs/p2571_defconfig\n+++ b/configs/p2571_defconfig\n@@ -36,8 +36,8 @@ CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"NVIDIA\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0955\n-CONFIG_G_DNL_PRODUCT_NUM=0x701a\n+CONFIG_USB_GADGET_MANUFACTURER=\"NVIDIA\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0955\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x701a\n CONFIG_USB_HOST_ETHER=y\n CONFIG_USB_ETHER_ASIX=y\ndiff --git a/configs/parrot_r16_defconfig b/configs/parrot_r16_defconfig\nindex 53825eba33c3..4b70fc5687eb 100644\n--- a/configs/parrot_r16_defconfig\n+++ b/configs/parrot_r16_defconfig\n@@ -24,7 +24,7 @@ CONFIG_USB_EHCI_HCD=y\n CONFIG_USB_MUSB_GADGET=y\n CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Allwinner Technology\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x1010\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Allwinner Technology\"\n-CONFIG_G_DNL_VENDOR_NUM=0x1f3a\n-CONFIG_G_DNL_PRODUCT_NUM=0x1010\ndiff --git a/configs/phycore-rk3288_defconfig b/configs/phycore-rk3288_defconfig\nindex 93ee353d0dc2..ba50ea9d8665 100644\n--- a/configs/phycore-rk3288_defconfig\n+++ b/configs/phycore-rk3288_defconfig\n@@ -72,11 +72,11 @@ CONFIG_SYSRESET=y\n CONFIG_USB=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Rockchip\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x2207\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x320a\n CONFIG_USB_GADGET_DWC2_OTG=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Rockchip\"\n-CONFIG_G_DNL_VENDOR_NUM=0x2207\n-CONFIG_G_DNL_PRODUCT_NUM=0x320a\n CONFIG_USB_HOST_ETHER=y\n CONFIG_USB_ETHER_ASIX=y\n CONFIG_USB_ETHER_SMSC95XX=y\ndiff --git a/configs/pico-imx6ul_defconfig b/configs/pico-imx6ul_defconfig\nindex abafc65f578c..c213493b12c0 100644\n--- a/configs/pico-imx6ul_defconfig\n+++ b/configs/pico-imx6ul_defconfig\n@@ -32,9 +32,9 @@ CONFIG_PHY_MICREL=y\n CONFIG_USB=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"FSL\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0525\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"FSL\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0525\n-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5\n CONFIG_OF_LIBFDT=y\ndiff --git a/configs/pico-imx7d_defconfig b/configs/pico-imx7d_defconfig\nindex 114c397d2e92..d34e6cecbbd9 100644\n--- a/configs/pico-imx7d_defconfig\n+++ b/configs/pico-imx7d_defconfig\n@@ -28,9 +28,9 @@ CONFIG_USB_EHCI_HCD=y\n CONFIG_MXC_USB_OTG_HACTIVE=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"FSL\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0525\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"FSL\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0525\n-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5\n CONFIG_OF_LIBFDT=y\ndiff --git a/configs/popmetal-rk3288_defconfig b/configs/popmetal-rk3288_defconfig\nindex 5e99f9c08922..a8d5cbf70940 100644\n--- a/configs/popmetal-rk3288_defconfig\n+++ b/configs/popmetal-rk3288_defconfig\n@@ -69,11 +69,11 @@ CONFIG_USB=y\n CONFIG_USB_DWC2=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Rockchip\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x2207\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x320a\n CONFIG_USB_GADGET_DWC2_OTG=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Rockchip\"\n-CONFIG_G_DNL_VENDOR_NUM=0x2207\n-CONFIG_G_DNL_PRODUCT_NUM=0x320a\n CONFIG_USB_HOST_ETHER=y\n CONFIG_USB_ETHER_ASIX=y\n CONFIG_USB_ETHER_SMSC95XX=y\ndiff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig\nindex b6624f0be16c..384ad35aec9c 100644\n--- a/configs/pxm2_defconfig\n+++ b/configs/pxm2_defconfig\n@@ -70,10 +70,10 @@ CONFIG_USB_MUSB_HOST=y\n CONFIG_USB_MUSB_GADGET=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Siemens AG\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0908\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x02d2\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Siemens AG\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0908\n-CONFIG_G_DNL_PRODUCT_NUM=0x02d2\n CONFIG_USB_ETHER=y\n CONFIG_USBNET_HOST_ADDR=\"de:ad:be:af:00:00\"\n # CONFIG_VIDEO_SW_CURSOR is not set\ndiff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig\nindex ed5f2f841b2a..3c9c2b342359 100644\n--- a/configs/rastaban_defconfig\n+++ b/configs/rastaban_defconfig\n@@ -66,9 +66,9 @@ CONFIG_USB_MUSB_HOST=y\n CONFIG_USB_MUSB_GADGET=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Siemens AG\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0908\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x02d2\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Siemens AG\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0908\n-CONFIG_G_DNL_PRODUCT_NUM=0x02d2\n CONFIG_USB_ETHER=y\n CONFIG_USBNET_HOST_ADDR=\"de:ad:be:af:00:00\"\ndiff --git a/configs/rock2_defconfig b/configs/rock2_defconfig\nindex b41644ef5fb3..d0ffdc7b0e70 100644\n--- a/configs/rock2_defconfig\n+++ b/configs/rock2_defconfig\n@@ -67,11 +67,11 @@ CONFIG_SYS_NS16550=y\n CONFIG_SYSRESET=y\n CONFIG_USB=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Rockchip\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x2207\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x320a\n CONFIG_USB_GADGET_DWC2_OTG=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Rockchip\"\n-CONFIG_G_DNL_VENDOR_NUM=0x2207\n-CONFIG_G_DNL_PRODUCT_NUM=0x320a\n CONFIG_DM_VIDEO=y\n CONFIG_DISPLAY=y\n CONFIG_VIDEO_ROCKCHIP=y\ndiff --git a/configs/rut_defconfig b/configs/rut_defconfig\nindex 1b787906baf9..1f472009321e 100644\n--- a/configs/rut_defconfig\n+++ b/configs/rut_defconfig\n@@ -71,10 +71,10 @@ CONFIG_USB_MUSB_HOST=y\n CONFIG_USB_MUSB_GADGET=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Siemens AG\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0908\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x02d2\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Siemens AG\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0908\n-CONFIG_G_DNL_PRODUCT_NUM=0x02d2\n CONFIG_USB_ETHER=y\n # CONFIG_VIDEO_SW_CURSOR is not set\n CONFIG_SYS_CONSOLE_BG_COL=0xff\ndiff --git a/configs/s5p_goni_defconfig b/configs/s5p_goni_defconfig\nindex 7d8792cb0580..eb6c2d70c0a6 100644\n--- a/configs/s5p_goni_defconfig\n+++ b/configs/s5p_goni_defconfig\n@@ -35,9 +35,9 @@ CONFIG_DM_PMIC=y\n CONFIG_DM_PMIC_MAX8998=y\n CONFIG_USB=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Samsung\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x04e8\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x6601\n CONFIG_USB_GADGET_DWC2_OTG=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Samsung\"\n-CONFIG_G_DNL_VENDOR_NUM=0x04e8\n-CONFIG_G_DNL_PRODUCT_NUM=0x6601\n CONFIG_FAT_WRITE=y\ndiff --git a/configs/s5pc210_universal_defconfig b/configs/s5pc210_universal_defconfig\nindex 16352ad7a061..e48e4b53835f 100644\n--- a/configs/s5pc210_universal_defconfig\n+++ b/configs/s5pc210_universal_defconfig\n@@ -46,8 +46,8 @@ CONFIG_DM_PMIC_MAX8998=y\n CONFIG_USB=y\n CONFIG_DM_USB=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Samsung\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x04e8\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x6601\n CONFIG_USB_GADGET_DWC2_OTG=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Samsung\"\n-CONFIG_G_DNL_VENDOR_NUM=0x04e8\n-CONFIG_G_DNL_PRODUCT_NUM=0x6601\ndiff --git a/configs/smartweb_defconfig b/configs/smartweb_defconfig\nindex accdd5da8818..583000e952d6 100644\n--- a/configs/smartweb_defconfig\n+++ b/configs/smartweb_defconfig\n@@ -46,10 +46,10 @@ CONFIG_PHYLIB=y\n CONFIG_USB=y\n CONFIG_DM_USB=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Siemens AG\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0908\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x02d2\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Siemens AG\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0908\n-CONFIG_G_DNL_PRODUCT_NUM=0x02d2\n CONFIG_USB_HOST_ETHER=y\n CONFIG_USB_ETHER_ASIX=y\n CONFIG_USB_ETHER_MCS7830=y\ndiff --git a/configs/sniper_defconfig b/configs/sniper_defconfig\nindex f24153b56fd3..75371c47ce8e 100644\n--- a/configs/sniper_defconfig\n+++ b/configs/sniper_defconfig\n@@ -43,8 +43,8 @@ CONFIG_SYS_NS16550=y\n CONFIG_USB=y\n CONFIG_USB_MUSB_GADGET=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Texas Instruments\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0451\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xd022\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Texas Instruments\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0451\n-CONFIG_G_DNL_PRODUCT_NUM=0xd022\n CONFIG_OF_LIBFDT=y\ndiff --git a/configs/socfpga_arria5_defconfig b/configs/socfpga_arria5_defconfig\nindex cf4fa20f2c1c..dc2182138c1d 100644\n--- a/configs/socfpga_arria5_defconfig\n+++ b/configs/socfpga_arria5_defconfig\n@@ -64,9 +64,9 @@ CONFIG_DM_USB=y\n CONFIG_USB_DWC2=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"altera\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0525\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5\n CONFIG_USB_GADGET_DWC2_OTG=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"altera\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0525\n-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5\n CONFIG_USE_TINY_PRINTF=y\ndiff --git a/configs/socfpga_cyclone5_defconfig b/configs/socfpga_cyclone5_defconfig\nindex 1cc6e161d969..9d465761440b 100644\n--- a/configs/socfpga_cyclone5_defconfig\n+++ b/configs/socfpga_cyclone5_defconfig\n@@ -64,9 +64,9 @@ CONFIG_DM_USB=y\n CONFIG_USB_DWC2=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"altera\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0525\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5\n CONFIG_USB_GADGET_DWC2_OTG=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"altera\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0525\n-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5\n CONFIG_USE_TINY_PRINTF=y\ndiff --git a/configs/socfpga_de0_nano_soc_defconfig b/configs/socfpga_de0_nano_soc_defconfig\nindex 0bb9121c262e..7a03e8240cd3 100644\n--- a/configs/socfpga_de0_nano_soc_defconfig\n+++ b/configs/socfpga_de0_nano_soc_defconfig\n@@ -58,9 +58,9 @@ CONFIG_DM_USB=y\n CONFIG_USB_DWC2=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"terasic\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0525\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5\n CONFIG_USB_GADGET_DWC2_OTG=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"terasic\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0525\n-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5\n CONFIG_USE_TINY_PRINTF=y\ndiff --git a/configs/socfpga_de10_nano_defconfig b/configs/socfpga_de10_nano_defconfig\nindex 16cff90369e7..c9f9e50ac85f 100644\n--- a/configs/socfpga_de10_nano_defconfig\n+++ b/configs/socfpga_de10_nano_defconfig\n@@ -56,9 +56,9 @@ CONFIG_DM_USB=y\n CONFIG_USB_DWC2=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"terasic\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0525\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5\n CONFIG_USB_GADGET_DWC2_OTG=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"terasic\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0525\n-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5\n CONFIG_USE_TINY_PRINTF=y\ndiff --git a/configs/socfpga_mcvevk_defconfig b/configs/socfpga_mcvevk_defconfig\nindex 0b4ad4118f24..d06db2548cde 100644\n--- a/configs/socfpga_mcvevk_defconfig\n+++ b/configs/socfpga_mcvevk_defconfig\n@@ -58,9 +58,9 @@ CONFIG_DM_USB=y\n CONFIG_USB_DWC2=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"denx\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0525\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5\n CONFIG_USB_GADGET_DWC2_OTG=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"denx\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0525\n-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5\n CONFIG_USE_TINY_PRINTF=y\ndiff --git a/configs/socfpga_sockit_defconfig b/configs/socfpga_sockit_defconfig\nindex b22bf6f608c5..1d50140119a5 100644\n--- a/configs/socfpga_sockit_defconfig\n+++ b/configs/socfpga_sockit_defconfig\n@@ -64,9 +64,9 @@ CONFIG_DM_USB=y\n CONFIG_USB_DWC2=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"terasic\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0525\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5\n CONFIG_USB_GADGET_DWC2_OTG=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"terasic\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0525\n-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5\n CONFIG_USE_TINY_PRINTF=y\ndiff --git a/configs/socfpga_socrates_defconfig b/configs/socfpga_socrates_defconfig\nindex 335c9e8384e4..c088c3ed479a 100644\n--- a/configs/socfpga_socrates_defconfig\n+++ b/configs/socfpga_socrates_defconfig\n@@ -64,9 +64,9 @@ CONFIG_DM_USB=y\n CONFIG_USB_DWC2=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"ebv\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0525\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5\n CONFIG_USB_GADGET_DWC2_OTG=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"ebv\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0525\n-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5\n CONFIG_USE_TINY_PRINTF=y\ndiff --git a/configs/socfpga_vining_fpga_defconfig b/configs/socfpga_vining_fpga_defconfig\nindex 3bcedb6d1aee..1911735af1ac 100644\n--- a/configs/socfpga_vining_fpga_defconfig\n+++ b/configs/socfpga_vining_fpga_defconfig\n@@ -81,9 +81,9 @@ CONFIG_DM_USB=y\n CONFIG_USB_DWC2=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"samtec\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0525\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5\n CONFIG_USB_GADGET_DWC2_OTG=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"samtec\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0525\n-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5\n CONFIG_USE_TINY_PRINTF=y\ndiff --git a/configs/taurus_defconfig b/configs/taurus_defconfig\nindex 71a382a3e132..bde93e958325 100644\n--- a/configs/taurus_defconfig\n+++ b/configs/taurus_defconfig\n@@ -53,8 +53,8 @@ CONFIG_PHYLIB=y\n CONFIG_USB=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Siemens AG\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0908\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x02d2\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Siemens AG\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0908\n-CONFIG_G_DNL_PRODUCT_NUM=0x02d2\n CONFIG_USE_TINY_PRINTF=y\ndiff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig\nindex 20814ccea33b..81225e865abf 100644\n--- a/configs/tbs2910_defconfig\n+++ b/configs/tbs2910_defconfig\n@@ -45,10 +45,10 @@ CONFIG_USB_STORAGE=y\n CONFIG_USB_KEYBOARD=y\n CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"TBS\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0525\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"TBS\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0525\n-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5\n CONFIG_CFB_CONSOLE_ANSI=y\n CONFIG_OF_LIBFDT=y\ndiff --git a/configs/thuban_defconfig b/configs/thuban_defconfig\nindex eb9124ce23ec..d9030ec82766 100644\n--- a/configs/thuban_defconfig\n+++ b/configs/thuban_defconfig\n@@ -66,8 +66,8 @@ CONFIG_USB_MUSB_HOST=y\n CONFIG_USB_MUSB_GADGET=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Siemens AG\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0908\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x02d2\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Siemens AG\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0908\n-CONFIG_G_DNL_PRODUCT_NUM=0x02d2\n CONFIG_USB_ETHER=y\ndiff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig\nindex 00e2d8195434..84fcd8979f20 100644\n--- a/configs/tinker-rk3288_defconfig\n+++ b/configs/tinker-rk3288_defconfig\n@@ -72,11 +72,11 @@ CONFIG_USB=y\n CONFIG_USB_DWC2=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Rockchip\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x2207\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x320a\n CONFIG_USB_GADGET_DWC2_OTG=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Rockchip\"\n-CONFIG_G_DNL_VENDOR_NUM=0x2207\n-CONFIG_G_DNL_PRODUCT_NUM=0x320a\n CONFIG_USB_HOST_ETHER=y\n CONFIG_USB_ETHER_ASIX=y\n CONFIG_USB_ETHER_SMSC95XX=y\ndiff --git a/configs/topic_miami_defconfig b/configs/topic_miami_defconfig\nindex 1080554cba37..a8028b6b18cd 100644\n--- a/configs/topic_miami_defconfig\n+++ b/configs/topic_miami_defconfig\n@@ -46,8 +46,8 @@ CONFIG_USB_ULPI_VIEWPORT=y\n CONFIG_USB_ULPI=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Xilinx\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x03fd\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x0300\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Xilinx\"\n-CONFIG_G_DNL_VENDOR_NUM=0x03fd\n-CONFIG_G_DNL_PRODUCT_NUM=0x0300\ndiff --git a/configs/topic_miamilite_defconfig b/configs/topic_miamilite_defconfig\nindex 1450fbc61aa0..568eb66d516d 100644\n--- a/configs/topic_miamilite_defconfig\n+++ b/configs/topic_miamilite_defconfig\n@@ -47,8 +47,8 @@ CONFIG_USB_ULPI_VIEWPORT=y\n CONFIG_USB_ULPI=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Xilinx\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x03fd\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x0300\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Xilinx\"\n-CONFIG_G_DNL_VENDOR_NUM=0x03fd\n-CONFIG_G_DNL_PRODUCT_NUM=0x0300\ndiff --git a/configs/topic_miamiplus_defconfig b/configs/topic_miamiplus_defconfig\nindex d3fc7ad63f32..94fa96221ce5 100644\n--- a/configs/topic_miamiplus_defconfig\n+++ b/configs/topic_miamiplus_defconfig\n@@ -46,8 +46,8 @@ CONFIG_USB_ULPI_VIEWPORT=y\n CONFIG_USB_ULPI=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Xilinx\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x03fd\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x0300\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Xilinx\"\n-CONFIG_G_DNL_VENDOR_NUM=0x03fd\n-CONFIG_G_DNL_PRODUCT_NUM=0x0300\ndiff --git a/configs/trats2_defconfig b/configs/trats2_defconfig\nindex bcc73d4fa266..a4cd8c875ca8 100644\n--- a/configs/trats2_defconfig\n+++ b/configs/trats2_defconfig\n@@ -50,8 +50,8 @@ CONFIG_DM_PMIC_MAX77686=y\n CONFIG_USB=y\n CONFIG_DM_USB=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Samsung\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x04e8\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x6601\n CONFIG_USB_GADGET_DWC2_OTG=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Samsung\"\n-CONFIG_G_DNL_VENDOR_NUM=0x04e8\n-CONFIG_G_DNL_PRODUCT_NUM=0x6601\ndiff --git a/configs/trats_defconfig b/configs/trats_defconfig\nindex 3f0c59baadcf..5c567f660d04 100644\n--- a/configs/trats_defconfig\n+++ b/configs/trats_defconfig\n@@ -49,8 +49,8 @@ CONFIG_PMIC_MAX8997=y\n CONFIG_USB=y\n CONFIG_DM_USB=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Samsung\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x04e8\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x6601\n CONFIG_USB_GADGET_DWC2_OTG=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Samsung\"\n-CONFIG_G_DNL_VENDOR_NUM=0x04e8\n-CONFIG_G_DNL_PRODUCT_NUM=0x6601\ndiff --git a/configs/venice2_defconfig b/configs/venice2_defconfig\nindex f90936e7440e..5820897ae5b0 100644\n--- a/configs/venice2_defconfig\n+++ b/configs/venice2_defconfig\n@@ -38,10 +38,10 @@ CONFIG_DM_USB=y\n CONFIG_USB_EHCI_HCD=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"NVIDIA\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0955\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x701a\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"NVIDIA\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0955\n-CONFIG_G_DNL_PRODUCT_NUM=0x701a\n CONFIG_USB_HOST_ETHER=y\n CONFIG_USB_ETHER_ASIX=y\ndiff --git a/configs/warp7_defconfig b/configs/warp7_defconfig\nindex 32cf7a4da4b4..c91090cac08b 100644\n--- a/configs/warp7_defconfig\n+++ b/configs/warp7_defconfig\n@@ -33,11 +33,11 @@ CONFIG_USB_EHCI_HCD=y\n CONFIG_MXC_USB_OTG_HACTIVE=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"FSL\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0525\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"FSL\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0525\n-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5\n CONFIG_USB_ETHER=y\n CONFIG_USB_ETH_CDC=y\n CONFIG_USBNET_HOST_ADDR=\"de:ad:be:af:00:00\"\ndiff --git a/configs/warp7_secure_defconfig b/configs/warp7_secure_defconfig\nindex 99764dbd0bb1..5a2b39493a24 100644\n--- a/configs/warp7_secure_defconfig\n+++ b/configs/warp7_secure_defconfig\n@@ -31,11 +31,11 @@ CONFIG_USB=y\n CONFIG_USB_EHCI_HCD=y\n CONFIG_MXC_USB_OTG_HACTIVE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"FSL\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0525\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"FSL\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0525\n-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5\n CONFIG_USB_ETHER=y\n CONFIG_USB_ETH_CDC=y\n CONFIG_USBNET_HOST_ADDR=\"de:ad:be:af:00:00\"\ndiff --git a/configs/warp_defconfig b/configs/warp_defconfig\nindex 8e58790269b8..3432a786ba78 100644\n--- a/configs/warp_defconfig\n+++ b/configs/warp_defconfig\n@@ -30,9 +30,9 @@ CONFIG_DFU_MMC=y\n CONFIG_USB=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"FSL\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x0525\n+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"FSL\"\n-CONFIG_G_DNL_VENDOR_NUM=0x0525\n-CONFIG_G_DNL_PRODUCT_NUM=0xa4a5\n CONFIG_OF_LIBFDT=y\ndiff --git a/configs/xilinx_zynqmp_ep_defconfig b/configs/xilinx_zynqmp_ep_defconfig\nindex c3ba5bf63242..03f529e6f4dd 100644\n--- a/configs/xilinx_zynqmp_ep_defconfig\n+++ b/configs/xilinx_zynqmp_ep_defconfig\n@@ -85,8 +85,8 @@ CONFIG_USB_DWC3_GADGET=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Xilinx\"\n-CONFIG_G_DNL_VENDOR_NUM=0x03fd\n-CONFIG_G_DNL_PRODUCT_NUM=0x0300\n+CONFIG_USB_GADGET_MANUFACTURER=\"Xilinx\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x03fd\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x0300\n # CONFIG_REGEX is not set\n CONFIG_EFI_LOADER_BOUNCE_BUFFER=y\ndiff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig\nindex 588b15430bf6..92ac41a6f25c 100644\n--- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig\n+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig\n@@ -77,7 +77,7 @@ CONFIG_USB_ULPI=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Xilinx\"\n-CONFIG_G_DNL_VENDOR_NUM=0x03FD\n-CONFIG_G_DNL_PRODUCT_NUM=0x0300\n+CONFIG_USB_GADGET_MANUFACTURER=\"Xilinx\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x03FD\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x0300\n CONFIG_EFI_LOADER_BOUNCE_BUFFER=y\ndiff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig\nindex 0a3ac9dbeadc..7a40b055a199 100644\n--- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig\n+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig\n@@ -75,7 +75,7 @@ CONFIG_USB_ULPI=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Xilinx\"\n-CONFIG_G_DNL_VENDOR_NUM=0x03FD\n-CONFIG_G_DNL_PRODUCT_NUM=0x0300\n+CONFIG_USB_GADGET_MANUFACTURER=\"Xilinx\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x03FD\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x0300\n CONFIG_EFI_LOADER_BOUNCE_BUFFER=y\ndiff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig b/configs/xilinx_zynqmp_zcu102_revA_defconfig\nindex ee0beda47a8e..670206800e04 100644\n--- a/configs/xilinx_zynqmp_zcu102_revA_defconfig\n+++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig\n@@ -80,7 +80,7 @@ CONFIG_USB_ULPI=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Xilinx\"\n-CONFIG_G_DNL_VENDOR_NUM=0x03FD\n-CONFIG_G_DNL_PRODUCT_NUM=0x0300\n+CONFIG_USB_GADGET_MANUFACTURER=\"Xilinx\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x03FD\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x0300\n CONFIG_EFI_LOADER_BOUNCE_BUFFER=y\ndiff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig\nindex e47e4bf6e5e1..d878c18476ec 100644\n--- a/configs/xilinx_zynqmp_zcu102_revB_defconfig\n+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig\n@@ -80,7 +80,7 @@ CONFIG_USB_ULPI=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Xilinx\"\n-CONFIG_G_DNL_VENDOR_NUM=0x03FD\n-CONFIG_G_DNL_PRODUCT_NUM=0x0300\n+CONFIG_USB_GADGET_MANUFACTURER=\"Xilinx\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x03FD\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x0300\n CONFIG_EFI_LOADER_BOUNCE_BUFFER=y\ndiff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig\nindex ae248f51bc26..cb867010e261 100644\n--- a/configs/zynq_microzed_defconfig\n+++ b/configs/zynq_microzed_defconfig\n@@ -53,8 +53,8 @@ CONFIG_USB_ULPI_VIEWPORT=y\n CONFIG_USB_ULPI=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Xilinx\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x03FD\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x0300\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Xilinx\"\n-CONFIG_G_DNL_VENDOR_NUM=0x03FD\n-CONFIG_G_DNL_PRODUCT_NUM=0x0300\ndiff --git a/configs/zynq_picozed_defconfig b/configs/zynq_picozed_defconfig\nindex 0afdd1147a90..39d76ba96553 100644\n--- a/configs/zynq_picozed_defconfig\n+++ b/configs/zynq_picozed_defconfig\n@@ -42,8 +42,8 @@ CONFIG_USB_ULPI_VIEWPORT=y\n CONFIG_USB_ULPI=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Xilinx\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x03fd\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x0300\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Xilinx\"\n-CONFIG_G_DNL_VENDOR_NUM=0x03fd\n-CONFIG_G_DNL_PRODUCT_NUM=0x0300\ndiff --git a/configs/zynq_z_turn_defconfig b/configs/zynq_z_turn_defconfig\nindex 3684b8531fa9..d21a8faa0f64 100644\n--- a/configs/zynq_z_turn_defconfig\n+++ b/configs/zynq_z_turn_defconfig\n@@ -52,8 +52,8 @@ CONFIG_USB_ULPI_VIEWPORT=y\n CONFIG_USB_ULPI=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Xilinx\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x03FD\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x0300\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Xilinx\"\n-CONFIG_G_DNL_VENDOR_NUM=0x03FD\n-CONFIG_G_DNL_PRODUCT_NUM=0x0300\ndiff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig\nindex 21852e55b6d4..a574a8991737 100644\n--- a/configs/zynq_zc702_defconfig\n+++ b/configs/zynq_zc702_defconfig\n@@ -60,8 +60,8 @@ CONFIG_USB_ULPI_VIEWPORT=y\n CONFIG_USB_ULPI=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Xilinx\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x03fd\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x0300\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Xilinx\"\n-CONFIG_G_DNL_VENDOR_NUM=0x03fd\n-CONFIG_G_DNL_PRODUCT_NUM=0x0300\ndiff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig\nindex dfafc9a9f6d5..d9718b06de2e 100644\n--- a/configs/zynq_zc706_defconfig\n+++ b/configs/zynq_zc706_defconfig\n@@ -56,8 +56,8 @@ CONFIG_USB_ULPI_VIEWPORT=y\n CONFIG_USB_ULPI=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Xilinx\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x03fd\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x0300\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Xilinx\"\n-CONFIG_G_DNL_VENDOR_NUM=0x03fd\n-CONFIG_G_DNL_PRODUCT_NUM=0x0300\ndiff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig\nindex bb512aff09d1..3a18c4aeb3a8 100644\n--- a/configs/zynq_zed_defconfig\n+++ b/configs/zynq_zed_defconfig\n@@ -53,8 +53,8 @@ CONFIG_USB_ULPI_VIEWPORT=y\n CONFIG_USB_ULPI=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Xilinx\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x03fd\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x0300\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Xilinx\"\n-CONFIG_G_DNL_VENDOR_NUM=0x03fd\n-CONFIG_G_DNL_PRODUCT_NUM=0x0300\ndiff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig\nindex fd31b4dc14f0..9edde2ace32c 100644\n--- a/configs/zynq_zybo_defconfig\n+++ b/configs/zynq_zybo_defconfig\n@@ -58,8 +58,8 @@ CONFIG_USB_ULPI_VIEWPORT=y\n CONFIG_USB_ULPI=y\n CONFIG_USB_STORAGE=y\n CONFIG_USB_GADGET=y\n+CONFIG_USB_GADGET_MANUFACTURER=\"Xilinx\"\n+CONFIG_USB_GADGET_VENDOR_NUM=0x03fd\n+CONFIG_USB_GADGET_PRODUCT_NUM=0x0300\n CONFIG_CI_UDC=y\n CONFIG_USB_GADGET_DOWNLOAD=y\n-CONFIG_G_DNL_MANUFACTURER=\"Xilinx\"\n-CONFIG_G_DNL_VENDOR_NUM=0x03fd\n-CONFIG_G_DNL_PRODUCT_NUM=0x0300\ndiff --git a/doc/README.android-fastboot b/doc/README.android-fastboot\nindex b8afa1576244..2c3ee7810a4f 100644\n--- a/doc/README.android-fastboot\n+++ b/doc/README.android-fastboot\n@@ -34,11 +34,11 @@ The fastboot gadget relies on the USB download gadget, so the following\n options must be configured:\n \n CONFIG_USB_GADGET_DOWNLOAD\n-CONFIG_G_DNL_VENDOR_NUM\n-CONFIG_G_DNL_PRODUCT_NUM\n-CONFIG_G_DNL_MANUFACTURER\n+CONFIG_USB_GADGET_VENDOR_NUM\n+CONFIG_USB_GADGET_PRODUCT_NUM\n+CONFIG_USB_GADGET_MANUFACTURER\n \n-NOTE: The CONFIG_G_DNL_VENDOR_NUM must be one of the numbers supported by\n+NOTE: The CONFIG_USB_GADGET_VENDOR_NUM must be one of the numbers supported by\n the fastboot client. The list of vendor IDs supported can be found in the\n fastboot client source code (fastboot.c) mentioned above.\n \ndiff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig\nindex 1201276be837..7bbfde26d0be 100644\n--- a/drivers/usb/gadget/Kconfig\n+++ b/drivers/usb/gadget/Kconfig\n@@ -36,6 +36,22 @@ menuconfig USB_GADGET\n \n if USB_GADGET\n \n+config USB_GADGET_MANUFACTURER\n+\tstring \"Vendor name of the USB device\"\n+\thelp\n+\t  Vendor name of the USB device emulated, reported to the host device.\n+\t  This is usually either the manufacturer of the device or the SoC.\n+\n+config USB_GADGET_VENDOR_NUM\n+\thex \"Vendor ID of the USB device\"\n+\t  Vendor ID of the USB device emulated, reported to the host device.\n+\t  This is usually the board or SoC vendor's, unless you've registered\n+\t  for one.\n+\n+config USB_GADGET_PRODUCT_NUM\n+\thex \"Product ID of the USB device\"\n+\t  Product ID of the USB device emulated, reported to the host device.\n+\n config USB_GADGET_ATMEL_USBA\n \tbool \"Atmel USBA\"\n \tselect USB_GADGET_DUALSPEED\n@@ -110,15 +126,6 @@ config USB_FUNCTION_SDP\n \t  allows to download images into memory and execute (jump to) them\n \t  using the same protocol as implemented by the i.MX family's boot ROM.\n \n-config G_DNL_MANUFACTURER\n-\tstring \"Vendor name of USB device\"\n-\n-config G_DNL_VENDOR_NUM\n-\thex \"Vendor ID of USB device\"\n-\n-config G_DNL_PRODUCT_NUM\n-\thex \"Product ID of USB device\"\n-\n endif # USB_GADGET_DOWNLOAD\n \n config USB_ETHER\ndiff --git a/drivers/usb/gadget/g_dnl.c b/drivers/usb/gadget/g_dnl.c\nindex 039331a5afd9..99d500a6af4e 100644\n--- a/drivers/usb/gadget/g_dnl.c\n+++ b/drivers/usb/gadget/g_dnl.c\n@@ -26,9 +26,9 @@\n \n /*\n  * One needs to define the following:\n- * CONFIG_G_DNL_VENDOR_NUM\n- * CONFIG_G_DNL_PRODUCT_NUM\n- * CONFIG_G_DNL_MANUFACTURER\n+ * CONFIG_USB_GADGET_VENDOR_NUM\n+ * CONFIG_USB_GADGET_PRODUCT_NUM\n+ * CONFIG_USB_GADGET_MANUFACTURER\n  * at e.g. ./configs/<board>_defconfig\n  */\n \n@@ -46,7 +46,7 @@\n \n static const char product[] = \"USB download gadget\";\n static char g_dnl_serial[MAX_STRING_SERIAL];\n-static const char manufacturer[] = CONFIG_G_DNL_MANUFACTURER;\n+static const char manufacturer[] = CONFIG_USB_GADGET_MANUFACTURER;\n \n void g_dnl_set_serialnumber(char *s)\n {\n@@ -62,8 +62,8 @@ static struct usb_device_descriptor device_desc = {\n \t.bDeviceClass = USB_CLASS_PER_INTERFACE,\n \t.bDeviceSubClass = 0, /*0x02:CDC-modem , 0x00:CDC-serial*/\n \n-\t.idVendor = __constant_cpu_to_le16(CONFIG_G_DNL_VENDOR_NUM),\n-\t.idProduct = __constant_cpu_to_le16(CONFIG_G_DNL_PRODUCT_NUM),\n+\t.idVendor = __constant_cpu_to_le16(CONFIG_USB_GADGET_VENDOR_NUM),\n+\t.idProduct = __constant_cpu_to_le16(CONFIG_USB_GADGET_PRODUCT_NUM),\n \t/* .iProduct = DYNAMIC */\n \t/* .iSerialNumber = DYNAMIC */\n \t.bNumConfigurations = 1,\ndiff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h\nindex b84f6e3480cb..6e76729ef41c 100644\n--- a/include/configs/am43xx_evm.h\n+++ b/include/configs/am43xx_evm.h\n@@ -89,9 +89,9 @@\n \n #undef CONFIG_USB_GADGET_DOWNLOAD\n #undef CONFIG_USB_GADGET_VBUS_DRAW\n-#undef CONFIG_G_DNL_MANUFACTURER\n-#undef CONFIG_G_DNL_VENDOR_NUM\n-#undef CONFIG_G_DNL_PRODUCT_NUM\n+#undef CONFIG_USB_GADGET_MANUFACTURER\n+#undef CONFIG_USB_GADGET_VENDOR_NUM\n+#undef CONFIG_USB_GADGET_PRODUCT_NUM\n #undef CONFIG_USB_GADGET_DUALSPEED\n #endif\n \ndiff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h\nindex 8bc7fbde9e36..13a45010bf5b 100644\n--- a/include/configs/odroid_xu3.h\n+++ b/include/configs/odroid_xu3.h\n@@ -45,7 +45,7 @@\n #define DFU_MANIFEST_POLL_TIMEOUT       25000\n \n /* THOR */\n-#define CONFIG_G_DNL_THOR_VENDOR_NUM\tCONFIG_G_DNL_VENDOR_NUM\n+#define CONFIG_G_DNL_THOR_VENDOR_NUM\tCONFIG_USB_GADGET_VENDOR_NUM\n #define CONFIG_G_DNL_THOR_PRODUCT_NUM\t0x685D\n #define CONFIG_USB_FUNCTION_THOR\n \n",
    "prefixes": [
        "U-Boot",
        "v2",
        "06/14"
    ]
}