From e6c0bc0643e5a4387fecbcf83080d0b796eb067c Mon Sep 17 00:00:00 2001 From: Sam Protsenko Date: Wed, 13 Apr 2016 14:20:30 +0300 Subject: [PATCH] usb: gadget Move: CONFIG_G_DNL_* to Kconfig And also reformat defconfigs using "make savedefconfig" rule. Signed-off-by: Sam Protsenko --- configs/A13-OLinuXino_defconfig | 3 +++ configs/CHIP_defconfig | 3 +++ configs/Cubietruck_defconfig | 3 +++ configs/am335x_baltos_defconfig | 3 +++ configs/am335x_boneblack_defconfig | 3 +++ configs/am335x_boneblack_vboot_defconfig | 3 +++ configs/am335x_evm_defconfig | 3 +++ configs/am335x_evm_nor_defconfig | 3 +++ configs/am335x_evm_norboot_defconfig | 3 +++ configs/am335x_evm_spiboot_defconfig | 3 +++ configs/am335x_evm_usbspl_defconfig | 3 +++ configs/am335x_gp_evm_defconfig | 3 +++ configs/am437x_gp_evm_defconfig | 3 +++ configs/am437x_sk_evm_defconfig | 3 +++ configs/am43xx_evm_defconfig | 3 +++ configs/am43xx_evm_ethboot_defconfig | 3 +++ configs/am43xx_evm_qspiboot_defconfig | 3 +++ configs/am43xx_evm_usbhost_boot_defconfig | 3 +++ configs/apalis_t30_defconfig | 3 +++ configs/bcm11130_defconfig | 3 +++ configs/bcm11130_nand_defconfig | 3 +++ configs/bcm28155_ap_defconfig | 3 +++ configs/bcm28155_w1d_defconfig | 3 +++ configs/beaver_defconfig | 3 +++ configs/birdland_bav335a_defconfig | 3 +++ configs/birdland_bav335b_defconfig | 3 +++ configs/cgtqmx6eval_defconfig | 3 +++ configs/colibri_t20_defconfig | 3 +++ configs/colibri_t30_defconfig | 3 +++ configs/colibri_vf_defconfig | 3 +++ configs/corvus_defconfig | 3 +++ configs/dalmore_defconfig | 3 +++ configs/dra72_evm_defconfig | 3 +++ configs/dra74_evm_defconfig | 3 +++ configs/dra7xx_evm_defconfig | 3 +++ configs/dra7xx_evm_qspiboot_defconfig | 3 +++ configs/dra7xx_evm_uart3_defconfig | 3 +++ configs/draco_defconfig | 3 +++ configs/e2220-1170_defconfig | 3 +++ configs/gwventana_defconfig | 3 +++ configs/jetson-tk1_defconfig | 3 +++ configs/kc1_defconfig | 3 +++ configs/mx6dlsabreauto_defconfig | 3 +++ configs/mx6dlsabresd_defconfig | 3 +++ configs/mx6qpsabreauto_defconfig | 3 +++ configs/mx6qsabreauto_defconfig | 3 +++ configs/mx6qsabrelite_defconfig | 3 +++ configs/mx6qsabresd_defconfig | 3 +++ configs/mx6sabresd_spl_defconfig | 3 +++ configs/mx7dsabresd_defconfig | 3 +++ configs/nitrogen6dl2g_defconfig | 3 +++ configs/nitrogen6dl_defconfig | 3 +++ configs/nitrogen6q2g_defconfig | 3 +++ configs/nitrogen6q_defconfig | 3 +++ configs/nitrogen6s1g_defconfig | 3 +++ configs/nitrogen6s_defconfig | 3 +++ configs/nyan-big_defconfig | 3 +++ configs/odroid-xu3_defconfig | 3 +++ configs/odroid_defconfig | 3 +++ configs/omap3_beagle_defconfig | 3 +++ configs/omap3_logic_defconfig | 3 +++ configs/omap5_uevm_defconfig | 3 +++ configs/origen_defconfig | 3 +++ configs/p2371-0000_defconfig | 3 +++ configs/p2371-2180_defconfig | 3 +++ configs/p2571_defconfig | 3 +++ configs/pxm2_defconfig | 3 +++ configs/rastaban_defconfig | 3 +++ configs/rut_defconfig | 3 +++ configs/s5p_goni_defconfig | 3 +++ configs/s5pc210_universal_defconfig | 3 +++ configs/smartweb_defconfig | 3 +++ configs/sniper_defconfig | 3 +++ configs/socfpga_arria5_defconfig | 3 +++ configs/socfpga_cyclone5_defconfig | 3 +++ configs/socfpga_de0_nano_soc_defconfig | 3 +++ configs/socfpga_mcvevk_defconfig | 3 +++ configs/socfpga_sockit_defconfig | 3 +++ configs/socfpga_socrates_defconfig | 3 +++ configs/taurus_defconfig | 3 +++ configs/tbs2910_defconfig | 3 +++ configs/thuban_defconfig | 3 +++ configs/trats2_defconfig | 3 +++ configs/trats_defconfig | 3 +++ configs/venice2_defconfig | 3 +++ configs/warp_defconfig | 3 +++ configs/xilinx_zynqmp_ep_defconfig | 3 +++ configs/zynq_picozed_defconfig | 3 +++ configs/zynq_zc702_defconfig | 3 +++ configs/zynq_zc706_defconfig | 3 +++ configs/zynq_zed_defconfig | 3 +++ configs/zynq_zybo_defconfig | 3 +++ drivers/usb/gadget/Kconfig | 13 +++++++++++++ drivers/usb/gadget/g_dnl.c | 2 +- include/configs/am335x_evm.h | 5 ----- include/configs/am43xx_evm.h | 11 +++-------- include/configs/baltos.h | 5 ----- include/configs/bav335x.h | 5 ----- include/configs/bcm28155_ap.h | 3 --- include/configs/cgtqmx6eval.h | 4 ---- include/configs/colibri_vf.h | 3 --- include/configs/corvus.h | 5 ----- include/configs/dra7xx_evm.h | 5 ----- include/configs/exynos4-common.h | 5 +---- include/configs/gw_ventana.h | 5 ----- include/configs/kc1.h | 8 -------- include/configs/mx6sabre_common.h | 4 ---- include/configs/mx7dsabresd.h | 4 ---- include/configs/nitrogen6x.h | 5 ----- include/configs/odroid_xu3.h | 5 ----- include/configs/omap3_beagle.h | 3 --- include/configs/omap3_logic.h | 3 --- include/configs/omap5_uevm.h | 5 ----- include/configs/s5p_goni.h | 6 ++---- include/configs/siemens-am33x-common.h | 3 --- include/configs/smartweb.h | 5 ----- include/configs/sniper.h | 8 -------- include/configs/socfpga_common.h | 9 ++------- include/configs/sunxi-common.h | 3 --- include/configs/taurus.h | 5 ----- include/configs/tbs2910.h | 3 --- include/configs/tegra-common-usb-gadget.h | 9 --------- include/configs/warp.h | 4 ---- include/configs/xilinx_zynqmp.h | 3 --- include/configs/zynq-common.h | 3 --- 125 files changed, 298 insertions(+), 147 deletions(-) diff --git a/configs/A13-OLinuXino_defconfig b/configs/A13-OLinuXino_defconfig index e46efc6e76..77a122875f 100644 --- a/configs/A13-OLinuXino_defconfig +++ b/configs/A13-OLinuXino_defconfig @@ -23,3 +23,6 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Allwinner Technology" +CONFIG_G_DNL_VENDOR_NUM=0x1f3a +CONFIG_G_DNL_PRODUCT_NUM=0x1010 diff --git a/configs/CHIP_defconfig b/configs/CHIP_defconfig index 4fc1a31dc5..5a38c19324 100644 --- a/configs/CHIP_defconfig +++ b/configs/CHIP_defconfig @@ -14,3 +14,6 @@ CONFIG_AXP_ALDO4_VOLT=3300 CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Allwinner Technology" +CONFIG_G_DNL_VENDOR_NUM=0x1f3a +CONFIG_G_DNL_PRODUCT_NUM=0x1010 diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig index 2ec2928d71..5a037a9be5 100644 --- a/configs/Cubietruck_defconfig +++ b/configs/Cubietruck_defconfig @@ -20,3 +20,6 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Allwinner Technology" +CONFIG_G_DNL_VENDOR_NUM=0x1f3a +CONFIG_G_DNL_PRODUCT_NUM=0x1010 diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig index c0c7468826..e43a121e3e 100644 --- a/configs/am335x_baltos_defconfig +++ b/configs/am335x_baltos_defconfig @@ -16,4 +16,7 @@ CONFIG_USB=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Texas Instruments" +CONFIG_G_DNL_VENDOR_NUM=0x0403 +CONFIG_G_DNL_PRODUCT_NUM=0xbd00 CONFIG_OF_LIBFDT=y diff --git a/configs/am335x_boneblack_defconfig b/configs/am335x_boneblack_defconfig index 8f781c833a..d8e793f25e 100644 --- a/configs/am335x_boneblack_defconfig +++ b/configs/am335x_boneblack_defconfig @@ -21,4 +21,7 @@ CONFIG_USB=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Texas Instruments" +CONFIG_G_DNL_VENDOR_NUM=0x0451 +CONFIG_G_DNL_PRODUCT_NUM=0xd022 CONFIG_OF_LIBFDT=y diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig index 8e252fff9a..10d4311380 100644 --- a/configs/am335x_boneblack_vboot_defconfig +++ b/configs/am335x_boneblack_vboot_defconfig @@ -28,3 +28,6 @@ CONFIG_USB=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Texas Instruments" +CONFIG_G_DNL_VENDOR_NUM=0x0451 +CONFIG_G_DNL_PRODUCT_NUM=0xd022 diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig index 426ddc5d9f..5ca0f24a00 100644 --- a/configs/am335x_evm_defconfig +++ b/configs/am335x_evm_defconfig @@ -20,4 +20,7 @@ CONFIG_USB=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Texas Instruments" +CONFIG_G_DNL_VENDOR_NUM=0x0451 +CONFIG_G_DNL_PRODUCT_NUM=0xd022 CONFIG_OF_LIBFDT=y diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig index 264fe367ea..bc84100688 100644 --- a/configs/am335x_evm_nor_defconfig +++ b/configs/am335x_evm_nor_defconfig @@ -16,4 +16,7 @@ CONFIG_USB=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Texas Instruments" +CONFIG_G_DNL_VENDOR_NUM=0x0451 +CONFIG_G_DNL_PRODUCT_NUM=0xd022 CONFIG_OF_LIBFDT=y diff --git a/configs/am335x_evm_norboot_defconfig b/configs/am335x_evm_norboot_defconfig index 222fe82fb5..4a724aa7c2 100644 --- a/configs/am335x_evm_norboot_defconfig +++ b/configs/am335x_evm_norboot_defconfig @@ -13,4 +13,7 @@ CONFIG_USB=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Texas Instruments" +CONFIG_G_DNL_VENDOR_NUM=0x0451 +CONFIG_G_DNL_PRODUCT_NUM=0xd022 CONFIG_OF_LIBFDT=y diff --git a/configs/am335x_evm_spiboot_defconfig b/configs/am335x_evm_spiboot_defconfig index 917128b784..542894168c 100644 --- a/configs/am335x_evm_spiboot_defconfig +++ b/configs/am335x_evm_spiboot_defconfig @@ -16,4 +16,7 @@ CONFIG_USB=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Texas Instruments" +CONFIG_G_DNL_VENDOR_NUM=0x0451 +CONFIG_G_DNL_PRODUCT_NUM=0xd022 CONFIG_OF_LIBFDT=y diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig index 81b3d27650..7f7a55d458 100644 --- a/configs/am335x_evm_usbspl_defconfig +++ b/configs/am335x_evm_usbspl_defconfig @@ -16,4 +16,7 @@ CONFIG_USB=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Texas Instruments" +CONFIG_G_DNL_VENDOR_NUM=0x0451 +CONFIG_G_DNL_PRODUCT_NUM=0xd022 CONFIG_OF_LIBFDT=y diff --git a/configs/am335x_gp_evm_defconfig b/configs/am335x_gp_evm_defconfig index a06f7225ac..1ee07c923a 100644 --- a/configs/am335x_gp_evm_defconfig +++ b/configs/am335x_gp_evm_defconfig @@ -22,4 +22,7 @@ CONFIG_USB=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Texas Instruments" +CONFIG_G_DNL_VENDOR_NUM=0x0451 +CONFIG_G_DNL_PRODUCT_NUM=0xd022 CONFIG_RSA=y diff --git a/configs/am437x_gp_evm_defconfig b/configs/am437x_gp_evm_defconfig index c1b26e0656..69f5ac71e6 100644 --- a/configs/am437x_gp_evm_defconfig +++ b/configs/am437x_gp_evm_defconfig @@ -27,3 +27,6 @@ CONFIG_USB_DWC3_OMAP=y CONFIG_USB_DWC3_PHY_OMAP=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Texas Instruments" +CONFIG_G_DNL_VENDOR_NUM=0x0403 +CONFIG_G_DNL_PRODUCT_NUM=0xbd00 diff --git a/configs/am437x_sk_evm_defconfig b/configs/am437x_sk_evm_defconfig index 80ff4da5cc..c7a9fbebc5 100644 --- a/configs/am437x_sk_evm_defconfig +++ b/configs/am437x_sk_evm_defconfig @@ -31,3 +31,6 @@ CONFIG_USB_DWC3_OMAP=y CONFIG_USB_DWC3_PHY_OMAP=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Texas Instruments" +CONFIG_G_DNL_VENDOR_NUM=0x0403 +CONFIG_G_DNL_PRODUCT_NUM=0xbd00 diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig index 97ea209d47..d6a1c3ce5f 100644 --- a/configs/am43xx_evm_defconfig +++ b/configs/am43xx_evm_defconfig @@ -18,4 +18,7 @@ CONFIG_USB_DWC3_OMAP=y CONFIG_USB_DWC3_PHY_OMAP=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Texas Instruments" +CONFIG_G_DNL_VENDOR_NUM=0x0403 +CONFIG_G_DNL_PRODUCT_NUM=0xbd00 CONFIG_OF_LIBFDT=y diff --git a/configs/am43xx_evm_ethboot_defconfig b/configs/am43xx_evm_ethboot_defconfig index 5963437912..67a9d493f2 100644 --- a/configs/am43xx_evm_ethboot_defconfig +++ b/configs/am43xx_evm_ethboot_defconfig @@ -17,4 +17,7 @@ CONFIG_USB_DWC3_OMAP=y CONFIG_USB_DWC3_PHY_OMAP=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Texas Instruments" +CONFIG_G_DNL_VENDOR_NUM=0x0403 +CONFIG_G_DNL_PRODUCT_NUM=0xbd00 CONFIG_OF_LIBFDT=y diff --git a/configs/am43xx_evm_qspiboot_defconfig b/configs/am43xx_evm_qspiboot_defconfig index 02ce1efc8a..2194b16b71 100644 --- a/configs/am43xx_evm_qspiboot_defconfig +++ b/configs/am43xx_evm_qspiboot_defconfig @@ -16,4 +16,7 @@ CONFIG_USB_DWC3_OMAP=y CONFIG_USB_DWC3_PHY_OMAP=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Texas Instruments" +CONFIG_G_DNL_VENDOR_NUM=0x0403 +CONFIG_G_DNL_PRODUCT_NUM=0xbd00 CONFIG_OF_LIBFDT=y diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig index 9ac5c99c9c..6840453e88 100644 --- a/configs/am43xx_evm_usbhost_boot_defconfig +++ b/configs/am43xx_evm_usbhost_boot_defconfig @@ -17,4 +17,7 @@ CONFIG_USB_DWC3_OMAP=y CONFIG_USB_DWC3_PHY_OMAP=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Texas Instruments" +CONFIG_G_DNL_VENDOR_NUM=0x0403 +CONFIG_G_DNL_PRODUCT_NUM=0xbd00 CONFIG_OF_LIBFDT=y diff --git a/configs/apalis_t30_defconfig b/configs/apalis_t30_defconfig index 882a21e8d9..0686129c03 100644 --- a/configs/apalis_t30_defconfig +++ b/configs/apalis_t30_defconfig @@ -20,4 +20,7 @@ CONFIG_DM_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="NVIDIA" +CONFIG_G_DNL_VENDOR_NUM=0x0955 +CONFIG_G_DNL_PRODUCT_NUM=0x701a CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/bcm11130_defconfig b/configs/bcm11130_defconfig index 74a2881f80..a1fc989bb2 100644 --- a/configs/bcm11130_defconfig +++ b/configs/bcm11130_defconfig @@ -12,3 +12,6 @@ CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Broadcom Corporation" +CONFIG_G_DNL_VENDOR_NUM=0x18d1 +CONFIG_G_DNL_PRODUCT_NUM=0x0d02 diff --git a/configs/bcm11130_nand_defconfig b/configs/bcm11130_nand_defconfig index 9c66669200..a49b3dc633 100644 --- a/configs/bcm11130_nand_defconfig +++ b/configs/bcm11130_nand_defconfig @@ -12,3 +12,6 @@ CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Broadcom Corporation" +CONFIG_G_DNL_VENDOR_NUM=0x18d1 +CONFIG_G_DNL_PRODUCT_NUM=0x0d02 diff --git a/configs/bcm28155_ap_defconfig b/configs/bcm28155_ap_defconfig index 50a6a30d59..8076c4f2fe 100644 --- a/configs/bcm28155_ap_defconfig +++ b/configs/bcm28155_ap_defconfig @@ -11,3 +11,6 @@ CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Broadcom Corporation" +CONFIG_G_DNL_VENDOR_NUM=0x18d1 +CONFIG_G_DNL_PRODUCT_NUM=0x0d02 diff --git a/configs/bcm28155_w1d_defconfig b/configs/bcm28155_w1d_defconfig index cd6a1904c9..25c8ff65d9 100644 --- a/configs/bcm28155_w1d_defconfig +++ b/configs/bcm28155_w1d_defconfig @@ -12,3 +12,6 @@ CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Broadcom Corporation" +CONFIG_G_DNL_VENDOR_NUM=0x18d1 +CONFIG_G_DNL_PRODUCT_NUM=0x0d02 diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig index 04ecab9e8c..a67d8031fe 100644 --- a/configs/beaver_defconfig +++ b/configs/beaver_defconfig @@ -24,4 +24,7 @@ CONFIG_DM_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="NVIDIA" +CONFIG_G_DNL_VENDOR_NUM=0x0955 +CONFIG_G_DNL_PRODUCT_NUM=0x701a CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/birdland_bav335a_defconfig b/configs/birdland_bav335a_defconfig index d9a58ada9a..5828e2b10d 100644 --- a/configs/birdland_bav335a_defconfig +++ b/configs/birdland_bav335a_defconfig @@ -15,4 +15,7 @@ CONFIG_USB=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Texas Instruments" +CONFIG_G_DNL_VENDOR_NUM=0x0451 +CONFIG_G_DNL_PRODUCT_NUM=0xd022 CONFIG_OF_LIBFDT=y diff --git a/configs/birdland_bav335b_defconfig b/configs/birdland_bav335b_defconfig index e605ac63bb..bbefb55f9b 100644 --- a/configs/birdland_bav335b_defconfig +++ b/configs/birdland_bav335b_defconfig @@ -15,4 +15,7 @@ CONFIG_USB=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Texas Instruments" +CONFIG_G_DNL_VENDOR_NUM=0x0451 +CONFIG_G_DNL_PRODUCT_NUM=0xd022 CONFIG_OF_LIBFDT=y diff --git a/configs/cgtqmx6eval_defconfig b/configs/cgtqmx6eval_defconfig index d21e3e91eb..ad6f0934d2 100644 --- a/configs/cgtqmx6eval_defconfig +++ b/configs/cgtqmx6eval_defconfig @@ -12,4 +12,7 @@ CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Congatec" +CONFIG_G_DNL_VENDOR_NUM=0x0525 +CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 CONFIG_OF_LIBFDT=y diff --git a/configs/colibri_t20_defconfig b/configs/colibri_t20_defconfig index 30d8b2bfa1..57e0eb5224 100644 --- a/configs/colibri_t20_defconfig +++ b/configs/colibri_t20_defconfig @@ -23,6 +23,9 @@ CONFIG_USB_ULPI=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="NVIDIA" +CONFIG_G_DNL_VENDOR_NUM=0x0955 +CONFIG_G_DNL_PRODUCT_NUM=0x701a CONFIG_DM_VIDEO=y CONFIG_VIDEO_TEGRA20=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/colibri_t30_defconfig b/configs/colibri_t30_defconfig index 81258a7d4b..583de258e4 100644 --- a/configs/colibri_t30_defconfig +++ b/configs/colibri_t30_defconfig @@ -18,4 +18,7 @@ CONFIG_DM_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="NVIDIA" +CONFIG_G_DNL_VENDOR_NUM=0x0955 +CONFIG_G_DNL_PRODUCT_NUM=0x701a CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/colibri_vf_defconfig b/configs/colibri_vf_defconfig index ba6ee38c4b..5481f04f1f 100644 --- a/configs/colibri_vf_defconfig +++ b/configs/colibri_vf_defconfig @@ -21,3 +21,6 @@ CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Toradex" +CONFIG_G_DNL_VENDOR_NUM=0x1b67 +CONFIG_G_DNL_PRODUCT_NUM=0x0016 diff --git a/configs/corvus_defconfig b/configs/corvus_defconfig index 534a31b67f..bae8a05cea 100644 --- a/configs/corvus_defconfig +++ b/configs/corvus_defconfig @@ -14,4 +14,7 @@ CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_ATMEL_USBA=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Siemens AG" +CONFIG_G_DNL_VENDOR_NUM=0x0908 +CONFIG_G_DNL_PRODUCT_NUM=0x02d2 CONFIG_OF_LIBFDT=y diff --git a/configs/dalmore_defconfig b/configs/dalmore_defconfig index ccfc6ba3ce..a1e2a730d0 100644 --- a/configs/dalmore_defconfig +++ b/configs/dalmore_defconfig @@ -22,4 +22,7 @@ CONFIG_DM_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="NVIDIA" +CONFIG_G_DNL_VENDOR_NUM=0x0955 +CONFIG_G_DNL_PRODUCT_NUM=0x701a CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/dra72_evm_defconfig b/configs/dra72_evm_defconfig index 1b8d2b9d32..0d63986803 100644 --- a/configs/dra72_evm_defconfig +++ b/configs/dra72_evm_defconfig @@ -30,3 +30,6 @@ CONFIG_USB_DWC3_OMAP=y CONFIG_USB_DWC3_PHY_OMAP=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Texas Instruments" +CONFIG_G_DNL_VENDOR_NUM=0x0451 +CONFIG_G_DNL_PRODUCT_NUM=0xd022 diff --git a/configs/dra74_evm_defconfig b/configs/dra74_evm_defconfig index 2abf81ecff..8ce544e025 100644 --- a/configs/dra74_evm_defconfig +++ b/configs/dra74_evm_defconfig @@ -29,3 +29,6 @@ CONFIG_USB_DWC3_OMAP=y CONFIG_USB_DWC3_PHY_OMAP=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Texas Instruments" +CONFIG_G_DNL_VENDOR_NUM=0x0451 +CONFIG_G_DNL_PRODUCT_NUM=0xd022 diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig index 4dc339c92b..1b1c0bec01 100644 --- a/configs/dra7xx_evm_defconfig +++ b/configs/dra7xx_evm_defconfig @@ -20,4 +20,7 @@ CONFIG_USB_DWC3_OMAP=y CONFIG_USB_DWC3_PHY_OMAP=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Texas Instruments" +CONFIG_G_DNL_VENDOR_NUM=0x0451 +CONFIG_G_DNL_PRODUCT_NUM=0xd022 CONFIG_OF_LIBFDT=y diff --git a/configs/dra7xx_evm_qspiboot_defconfig b/configs/dra7xx_evm_qspiboot_defconfig index 828a862284..01301884ae 100644 --- a/configs/dra7xx_evm_qspiboot_defconfig +++ b/configs/dra7xx_evm_qspiboot_defconfig @@ -20,4 +20,7 @@ CONFIG_USB_DWC3_OMAP=y CONFIG_USB_DWC3_PHY_OMAP=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Texas Instruments" +CONFIG_G_DNL_VENDOR_NUM=0x0451 +CONFIG_G_DNL_PRODUCT_NUM=0xd022 CONFIG_OF_LIBFDT=y diff --git a/configs/dra7xx_evm_uart3_defconfig b/configs/dra7xx_evm_uart3_defconfig index c5ff5a9a7d..ca8007753c 100644 --- a/configs/dra7xx_evm_uart3_defconfig +++ b/configs/dra7xx_evm_uart3_defconfig @@ -21,4 +21,7 @@ CONFIG_USB_DWC3_OMAP=y CONFIG_USB_DWC3_PHY_OMAP=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Texas Instruments" +CONFIG_G_DNL_VENDOR_NUM=0x0451 +CONFIG_G_DNL_PRODUCT_NUM=0xd022 CONFIG_OF_LIBFDT=y diff --git a/configs/draco_defconfig b/configs/draco_defconfig index 48ae025750..7c3f82855f 100644 --- a/configs/draco_defconfig +++ b/configs/draco_defconfig @@ -16,4 +16,7 @@ CONFIG_USB=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Siemens AG" +CONFIG_G_DNL_VENDOR_NUM=0x0908 +CONFIG_G_DNL_PRODUCT_NUM=0x02d2 CONFIG_OF_LIBFDT=y diff --git a/configs/e2220-1170_defconfig b/configs/e2220-1170_defconfig index 845e6d3c74..38c085a1c9 100644 --- a/configs/e2220-1170_defconfig +++ b/configs/e2220-1170_defconfig @@ -20,3 +20,6 @@ CONFIG_DM_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="NVIDIA" +CONFIG_G_DNL_VENDOR_NUM=0x0955 +CONFIG_G_DNL_PRODUCT_NUM=0x701a diff --git a/configs/gwventana_defconfig b/configs/gwventana_defconfig index 0afc696408..49ee27315e 100644 --- a/configs/gwventana_defconfig +++ b/configs/gwventana_defconfig @@ -20,4 +20,7 @@ CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Gateworks" +CONFIG_G_DNL_VENDOR_NUM=0x0525 +CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 CONFIG_OF_LIBFDT=y diff --git a/configs/jetson-tk1_defconfig b/configs/jetson-tk1_defconfig index eefe971202..bf509c2035 100644 --- a/configs/jetson-tk1_defconfig +++ b/configs/jetson-tk1_defconfig @@ -24,4 +24,7 @@ CONFIG_DM_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="NVIDIA" +CONFIG_G_DNL_VENDOR_NUM=0x0955 +CONFIG_G_DNL_PRODUCT_NUM=0x701a CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/kc1_defconfig b/configs/kc1_defconfig index 351da874d4..a9643cf959 100644 --- a/configs/kc1_defconfig +++ b/configs/kc1_defconfig @@ -14,4 +14,7 @@ CONFIG_USB=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Texas Instruments" +CONFIG_G_DNL_VENDOR_NUM=0x0451 +CONFIG_G_DNL_PRODUCT_NUM=0xd022 CONFIG_OF_LIBFDT=y diff --git a/configs/mx6dlsabreauto_defconfig b/configs/mx6dlsabreauto_defconfig index 350ca682ca..561e886b53 100644 --- a/configs/mx6dlsabreauto_defconfig +++ b/configs/mx6dlsabreauto_defconfig @@ -11,4 +11,7 @@ CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="FSL" +CONFIG_G_DNL_VENDOR_NUM=0x0525 +CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 CONFIG_OF_LIBFDT=y diff --git a/configs/mx6dlsabresd_defconfig b/configs/mx6dlsabresd_defconfig index 4f467531af..870e403a1d 100644 --- a/configs/mx6dlsabresd_defconfig +++ b/configs/mx6dlsabresd_defconfig @@ -11,4 +11,7 @@ CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="FSL" +CONFIG_G_DNL_VENDOR_NUM=0x0525 +CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 CONFIG_OF_LIBFDT=y diff --git a/configs/mx6qpsabreauto_defconfig b/configs/mx6qpsabreauto_defconfig index 47843f160a..61f0a75ec8 100644 --- a/configs/mx6qpsabreauto_defconfig +++ b/configs/mx6qpsabreauto_defconfig @@ -9,4 +9,7 @@ CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="FSL" +CONFIG_G_DNL_VENDOR_NUM=0x0525 +CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 CONFIG_OF_LIBFDT=y diff --git a/configs/mx6qsabreauto_defconfig b/configs/mx6qsabreauto_defconfig index f719673e08..49aa619655 100644 --- a/configs/mx6qsabreauto_defconfig +++ b/configs/mx6qsabreauto_defconfig @@ -11,4 +11,7 @@ CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="FSL" +CONFIG_G_DNL_VENDOR_NUM=0x0525 +CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 CONFIG_OF_LIBFDT=y diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig index d6f76cc43a..84faa2fc5d 100644 --- a/configs/mx6qsabrelite_defconfig +++ b/configs/mx6qsabrelite_defconfig @@ -13,4 +13,7 @@ CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Boundary" +CONFIG_G_DNL_VENDOR_NUM=0x0525 +CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 CONFIG_OF_LIBFDT=y diff --git a/configs/mx6qsabresd_defconfig b/configs/mx6qsabresd_defconfig index 6d6afd847d..7b69de1425 100644 --- a/configs/mx6qsabresd_defconfig +++ b/configs/mx6qsabresd_defconfig @@ -11,4 +11,7 @@ CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="FSL" +CONFIG_G_DNL_VENDOR_NUM=0x0525 +CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 CONFIG_OF_LIBFDT=y diff --git a/configs/mx6sabresd_spl_defconfig b/configs/mx6sabresd_spl_defconfig index 078a362147..540a822ce4 100644 --- a/configs/mx6sabresd_spl_defconfig +++ b/configs/mx6sabresd_spl_defconfig @@ -12,4 +12,7 @@ CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="FSL" +CONFIG_G_DNL_VENDOR_NUM=0x0525 +CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 CONFIG_OF_LIBFDT=y diff --git a/configs/mx7dsabresd_defconfig b/configs/mx7dsabresd_defconfig index 4e4252db73..fe7e55df96 100644 --- a/configs/mx7dsabresd_defconfig +++ b/configs/mx7dsabresd_defconfig @@ -16,4 +16,7 @@ CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="FSL" +CONFIG_G_DNL_VENDOR_NUM=0x0525 +CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 CONFIG_OF_LIBFDT=y diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig index 338911a6f8..34ddff920d 100644 --- a/configs/nitrogen6dl2g_defconfig +++ b/configs/nitrogen6dl2g_defconfig @@ -11,4 +11,7 @@ CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Boundary" +CONFIG_G_DNL_VENDOR_NUM=0x0525 +CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 CONFIG_OF_LIBFDT=y diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig index 0c38e9214e..c2bea2e446 100644 --- a/configs/nitrogen6dl_defconfig +++ b/configs/nitrogen6dl_defconfig @@ -11,4 +11,7 @@ CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Boundary" +CONFIG_G_DNL_VENDOR_NUM=0x0525 +CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 CONFIG_OF_LIBFDT=y diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig index 710fdef82c..0ce35b01b4 100644 --- a/configs/nitrogen6q2g_defconfig +++ b/configs/nitrogen6q2g_defconfig @@ -11,4 +11,7 @@ CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Boundary" +CONFIG_G_DNL_VENDOR_NUM=0x0525 +CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 CONFIG_OF_LIBFDT=y diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig index 0563ff3db6..ef2f0e2c22 100644 --- a/configs/nitrogen6q_defconfig +++ b/configs/nitrogen6q_defconfig @@ -11,4 +11,7 @@ CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Boundary" +CONFIG_G_DNL_VENDOR_NUM=0x0525 +CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 CONFIG_OF_LIBFDT=y diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig index 56c4b152f2..0aac6306dd 100644 --- a/configs/nitrogen6s1g_defconfig +++ b/configs/nitrogen6s1g_defconfig @@ -11,4 +11,7 @@ CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Boundary" +CONFIG_G_DNL_VENDOR_NUM=0x0525 +CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 CONFIG_OF_LIBFDT=y diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig index 0229eaa1d9..d6280df534 100644 --- a/configs/nitrogen6s_defconfig +++ b/configs/nitrogen6s_defconfig @@ -11,4 +11,7 @@ CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Boundary" +CONFIG_G_DNL_VENDOR_NUM=0x0525 +CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 CONFIG_OF_LIBFDT=y diff --git a/configs/nyan-big_defconfig b/configs/nyan-big_defconfig index 8ce1c2f4ab..d86a55ca68 100644 --- a/configs/nyan-big_defconfig +++ b/configs/nyan-big_defconfig @@ -37,6 +37,9 @@ CONFIG_DM_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="NVIDIA" +CONFIG_G_DNL_VENDOR_NUM=0x0955 +CONFIG_G_DNL_PRODUCT_NUM=0x701a CONFIG_DM_VIDEO=y CONFIG_DISPLAY=y CONFIG_VIDEO_TEGRA124=y diff --git a/configs/odroid-xu3_defconfig b/configs/odroid-xu3_defconfig index 32f6dec873..bb0576a7fe 100644 --- a/configs/odroid-xu3_defconfig +++ b/configs/odroid-xu3_defconfig @@ -24,5 +24,8 @@ CONFIG_USB_DWC3_GADGET=y CONFIG_USB_DWC3_PHY_SAMSUNG=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Samsung" +CONFIG_G_DNL_VENDOR_NUM=0x04e8 +CONFIG_G_DNL_PRODUCT_NUM=0x6601 CONFIG_VIDEO_BRIDGE=y CONFIG_ERRNO_STR=y diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig index 2aea8c6db7..a92bbe184d 100644 --- a/configs/odroid_defconfig +++ b/configs/odroid_defconfig @@ -26,4 +26,7 @@ CONFIG_DM_USB=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Samsung" +CONFIG_G_DNL_VENDOR_NUM=0x04e8 +CONFIG_G_DNL_PRODUCT_NUM=0x6601 CONFIG_ERRNO_STR=y diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig index fdce13c88b..ab54570c67 100644 --- a/configs/omap3_beagle_defconfig +++ b/configs/omap3_beagle_defconfig @@ -11,4 +11,7 @@ CONFIG_USB=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="TI" +CONFIG_G_DNL_VENDOR_NUM=0x0451 +CONFIG_G_DNL_PRODUCT_NUM=0xd022 CONFIG_OF_LIBFDT=y diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig index ccb968622d..dfbd1805fe 100644 --- a/configs/omap3_logic_defconfig +++ b/configs/omap3_logic_defconfig @@ -15,4 +15,7 @@ CONFIG_USB=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="TI" +CONFIG_G_DNL_VENDOR_NUM=0x0451 +CONFIG_G_DNL_PRODUCT_NUM=0xd022 CONFIG_OF_LIBFDT=y diff --git a/configs/omap5_uevm_defconfig b/configs/omap5_uevm_defconfig index 7fe4fe5356..135c89dcb1 100644 --- a/configs/omap5_uevm_defconfig +++ b/configs/omap5_uevm_defconfig @@ -14,4 +14,7 @@ CONFIG_USB_DWC3_OMAP=y CONFIG_USB_DWC3_PHY_OMAP=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Texas Instruments" +CONFIG_G_DNL_VENDOR_NUM=0x0403 +CONFIG_G_DNL_PRODUCT_NUM=0xbd00 CONFIG_OF_LIBFDT=y diff --git a/configs/origen_defconfig b/configs/origen_defconfig index 17141fdb29..de4a816c97 100644 --- a/configs/origen_defconfig +++ b/configs/origen_defconfig @@ -16,3 +16,6 @@ CONFIG_DM_USB=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Samsung" +CONFIG_G_DNL_VENDOR_NUM=0x04e8 +CONFIG_G_DNL_PRODUCT_NUM=0x6601 diff --git a/configs/p2371-0000_defconfig b/configs/p2371-0000_defconfig index d258c7c53d..c9f7be2b95 100644 --- a/configs/p2371-0000_defconfig +++ b/configs/p2371-0000_defconfig @@ -21,3 +21,6 @@ CONFIG_DM_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="NVIDIA" +CONFIG_G_DNL_VENDOR_NUM=0x0955 +CONFIG_G_DNL_PRODUCT_NUM=0x701a diff --git a/configs/p2371-2180_defconfig b/configs/p2371-2180_defconfig index 26765d6f75..086a294dc4 100644 --- a/configs/p2371-2180_defconfig +++ b/configs/p2371-2180_defconfig @@ -23,3 +23,6 @@ CONFIG_DM_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="NVIDIA" +CONFIG_G_DNL_VENDOR_NUM=0x0955 +CONFIG_G_DNL_PRODUCT_NUM=0x701a diff --git a/configs/p2571_defconfig b/configs/p2571_defconfig index 68abec1825..f7596a578f 100644 --- a/configs/p2571_defconfig +++ b/configs/p2571_defconfig @@ -21,3 +21,6 @@ CONFIG_DM_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="NVIDIA" +CONFIG_G_DNL_VENDOR_NUM=0x0955 +CONFIG_G_DNL_PRODUCT_NUM=0x701a diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig index f27478413b..7a53016fa1 100644 --- a/configs/pxm2_defconfig +++ b/configs/pxm2_defconfig @@ -17,4 +17,7 @@ CONFIG_USB=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Siemens AG" +CONFIG_G_DNL_VENDOR_NUM=0x0908 +CONFIG_G_DNL_PRODUCT_NUM=0x02d2 CONFIG_OF_LIBFDT=y diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig index 508ee47dc7..e3bb5aeece 100644 --- a/configs/rastaban_defconfig +++ b/configs/rastaban_defconfig @@ -16,4 +16,7 @@ CONFIG_USB=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Siemens AG" +CONFIG_G_DNL_VENDOR_NUM=0x0908 +CONFIG_G_DNL_PRODUCT_NUM=0x02d2 CONFIG_OF_LIBFDT=y diff --git a/configs/rut_defconfig b/configs/rut_defconfig index 0363980b83..035fd1e13b 100644 --- a/configs/rut_defconfig +++ b/configs/rut_defconfig @@ -17,4 +17,7 @@ CONFIG_USB=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Siemens AG" +CONFIG_G_DNL_VENDOR_NUM=0x0908 +CONFIG_G_DNL_PRODUCT_NUM=0x02d2 CONFIG_OF_LIBFDT=y diff --git a/configs/s5p_goni_defconfig b/configs/s5p_goni_defconfig index 47cf3af8d4..8c1438d09d 100644 --- a/configs/s5p_goni_defconfig +++ b/configs/s5p_goni_defconfig @@ -15,3 +15,6 @@ CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Samsung" +CONFIG_G_DNL_VENDOR_NUM=0x04e8 +CONFIG_G_DNL_PRODUCT_NUM=0x6601 diff --git a/configs/s5pc210_universal_defconfig b/configs/s5pc210_universal_defconfig index 9927012654..d91b433bab 100644 --- a/configs/s5pc210_universal_defconfig +++ b/configs/s5pc210_universal_defconfig @@ -15,3 +15,6 @@ CONFIG_DM_USB=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Samsung" +CONFIG_G_DNL_VENDOR_NUM=0x04e8 +CONFIG_G_DNL_PRODUCT_NUM=0x6601 diff --git a/configs/smartweb_defconfig b/configs/smartweb_defconfig index 6d254798b9..ce514c2de3 100644 --- a/configs/smartweb_defconfig +++ b/configs/smartweb_defconfig @@ -11,4 +11,7 @@ CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b" CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Siemens AG" +CONFIG_G_DNL_VENDOR_NUM=0x0908 +CONFIG_G_DNL_PRODUCT_NUM=0x02d2 CONFIG_OF_LIBFDT=y diff --git a/configs/sniper_defconfig b/configs/sniper_defconfig index 6816d5a465..6a31771edd 100644 --- a/configs/sniper_defconfig +++ b/configs/sniper_defconfig @@ -14,4 +14,7 @@ CONFIG_USB=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Texas Instruments" +CONFIG_G_DNL_VENDOR_NUM=0x0451 +CONFIG_G_DNL_PRODUCT_NUM=0xd022 CONFIG_OF_LIBFDT=y diff --git a/configs/socfpga_arria5_defconfig b/configs/socfpga_arria5_defconfig index fbf72660ac..9c8671c8f4 100644 --- a/configs/socfpga_arria5_defconfig +++ b/configs/socfpga_arria5_defconfig @@ -30,3 +30,6 @@ CONFIG_DM_USB=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="altera" +CONFIG_G_DNL_VENDOR_NUM=0x0525 +CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 diff --git a/configs/socfpga_cyclone5_defconfig b/configs/socfpga_cyclone5_defconfig index da323db5b0..b68b298f87 100644 --- a/configs/socfpga_cyclone5_defconfig +++ b/configs/socfpga_cyclone5_defconfig @@ -30,3 +30,6 @@ CONFIG_DM_USB=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="altera" +CONFIG_G_DNL_VENDOR_NUM=0x0525 +CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 diff --git a/configs/socfpga_de0_nano_soc_defconfig b/configs/socfpga_de0_nano_soc_defconfig index c5efba5b4e..d813dc9287 100644 --- a/configs/socfpga_de0_nano_soc_defconfig +++ b/configs/socfpga_de0_nano_soc_defconfig @@ -25,3 +25,6 @@ CONFIG_DM_USB=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="terasic" +CONFIG_G_DNL_VENDOR_NUM=0x0525 +CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 diff --git a/configs/socfpga_mcvevk_defconfig b/configs/socfpga_mcvevk_defconfig index f1ae006a29..5fe6238a3a 100644 --- a/configs/socfpga_mcvevk_defconfig +++ b/configs/socfpga_mcvevk_defconfig @@ -25,3 +25,6 @@ CONFIG_DM_USB=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="denx" +CONFIG_G_DNL_VENDOR_NUM=0x0525 +CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 diff --git a/configs/socfpga_sockit_defconfig b/configs/socfpga_sockit_defconfig index 730d9fc631..8894e09271 100644 --- a/configs/socfpga_sockit_defconfig +++ b/configs/socfpga_sockit_defconfig @@ -30,3 +30,6 @@ CONFIG_DM_USB=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="terasic" +CONFIG_G_DNL_VENDOR_NUM=0x0525 +CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 diff --git a/configs/socfpga_socrates_defconfig b/configs/socfpga_socrates_defconfig index 1cf2ce0c5c..562052c3f7 100644 --- a/configs/socfpga_socrates_defconfig +++ b/configs/socfpga_socrates_defconfig @@ -29,3 +29,6 @@ CONFIG_DM_USB=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="ebv" +CONFIG_G_DNL_VENDOR_NUM=0x0525 +CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig index 8cdbb89720..b5ab8b4813 100644 --- a/configs/taurus_defconfig +++ b/configs/taurus_defconfig @@ -16,5 +16,8 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Siemens AG" +CONFIG_G_DNL_VENDOR_NUM=0x0908 +CONFIG_G_DNL_PRODUCT_NUM=0x02d2 CONFIG_USE_TINY_PRINTF=y CONFIG_OF_LIBFDT=y diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig index 5dca48fd74..9f6aa8d5c7 100644 --- a/configs/tbs2910_defconfig +++ b/configs/tbs2910_defconfig @@ -12,4 +12,7 @@ CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="TBS" +CONFIG_G_DNL_VENDOR_NUM=0x0525 +CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 CONFIG_OF_LIBFDT=y diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig index 0fd57e6a53..047dc69e16 100644 --- a/configs/thuban_defconfig +++ b/configs/thuban_defconfig @@ -16,4 +16,7 @@ CONFIG_USB=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Siemens AG" +CONFIG_G_DNL_VENDOR_NUM=0x0908 +CONFIG_G_DNL_PRODUCT_NUM=0x02d2 CONFIG_OF_LIBFDT=y diff --git a/configs/trats2_defconfig b/configs/trats2_defconfig index d7f8405081..14bdc6aac3 100644 --- a/configs/trats2_defconfig +++ b/configs/trats2_defconfig @@ -18,3 +18,6 @@ CONFIG_DM_USB=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Samsung" +CONFIG_G_DNL_VENDOR_NUM=0x04e8 +CONFIG_G_DNL_PRODUCT_NUM=0x6601 diff --git a/configs/trats_defconfig b/configs/trats_defconfig index b5431e5722..c3b82bb507 100644 --- a/configs/trats_defconfig +++ b/configs/trats_defconfig @@ -17,3 +17,6 @@ CONFIG_DM_USB=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Samsung" +CONFIG_G_DNL_VENDOR_NUM=0x04e8 +CONFIG_G_DNL_PRODUCT_NUM=0x6601 diff --git a/configs/venice2_defconfig b/configs/venice2_defconfig index 0d20697b65..75e7579c56 100644 --- a/configs/venice2_defconfig +++ b/configs/venice2_defconfig @@ -22,4 +22,7 @@ CONFIG_DM_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="NVIDIA" +CONFIG_G_DNL_VENDOR_NUM=0x0955 +CONFIG_G_DNL_PRODUCT_NUM=0x701a CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/warp_defconfig b/configs/warp_defconfig index c51516c3d8..b9e4648414 100644 --- a/configs/warp_defconfig +++ b/configs/warp_defconfig @@ -12,4 +12,7 @@ CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="FSL" +CONFIG_G_DNL_VENDOR_NUM=0x0525 +CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 CONFIG_OF_LIBFDT=y diff --git a/configs/xilinx_zynqmp_ep_defconfig b/configs/xilinx_zynqmp_ep_defconfig index 3bab31c8e8..834cc45690 100644 --- a/configs/xilinx_zynqmp_ep_defconfig +++ b/configs/xilinx_zynqmp_ep_defconfig @@ -42,4 +42,7 @@ CONFIG_USB_DWC3=y CONFIG_USB_DWC3_GADGET=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Xilinx" +CONFIG_G_DNL_VENDOR_NUM=0x03fd +CONFIG_G_DNL_PRODUCT_NUM=0x0300 # CONFIG_REGEX is not set diff --git a/configs/zynq_picozed_defconfig b/configs/zynq_picozed_defconfig index 3bd6fca900..ffbc73d56c 100644 --- a/configs/zynq_picozed_defconfig +++ b/configs/zynq_picozed_defconfig @@ -18,3 +18,6 @@ CONFIG_USB_ULPI=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Xilinx" +CONFIG_G_DNL_VENDOR_NUM=0x03fd +CONFIG_G_DNL_PRODUCT_NUM=0x0300 diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig index 81d211f942..5d9136c983 100644 --- a/configs/zynq_zc702_defconfig +++ b/configs/zynq_zc702_defconfig @@ -30,3 +30,6 @@ CONFIG_USB_ULPI=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Xilinx" +CONFIG_G_DNL_VENDOR_NUM=0x03fd +CONFIG_G_DNL_PRODUCT_NUM=0x0300 diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig index 75d510170e..d7c1b9623d 100644 --- a/configs/zynq_zc706_defconfig +++ b/configs/zynq_zc706_defconfig @@ -27,3 +27,6 @@ CONFIG_USB_ULPI=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Xilinx" +CONFIG_G_DNL_VENDOR_NUM=0x03fd +CONFIG_G_DNL_PRODUCT_NUM=0x0300 diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig index 51b2788ce1..bc3af099cb 100644 --- a/configs/zynq_zed_defconfig +++ b/configs/zynq_zed_defconfig @@ -27,3 +27,6 @@ CONFIG_USB_ULPI=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Xilinx" +CONFIG_G_DNL_VENDOR_NUM=0x03fd +CONFIG_G_DNL_PRODUCT_NUM=0x0300 diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig index 01ca5d210a..1895f950c9 100644 --- a/configs/zynq_zybo_defconfig +++ b/configs/zynq_zybo_defconfig @@ -29,3 +29,6 @@ CONFIG_USB_ULPI=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Xilinx" +CONFIG_G_DNL_VENDOR_NUM=0x03fd +CONFIG_G_DNL_PRODUCT_NUM=0x0300 diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index 969873c928..a35a1c7760 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig @@ -86,4 +86,17 @@ config USB_GADGET_DOWNLOAD Composite USB download gadget support (g_dnl) for download functions. This code works on top of composite gadget. +if USB_GADGET_DOWNLOAD + +config G_DNL_MANUFACTURER + string "Vendor name of USB device" + +config G_DNL_VENDOR_NUM + hex "Vendor ID of USB device" + +config G_DNL_PRODUCT_NUM + hex "Product ID of USB device" + +endif # USB_GADGET_DOWNLOAD + endif # USB_GADGET diff --git a/drivers/usb/gadget/g_dnl.c b/drivers/usb/gadget/g_dnl.c index bd3aad927b..45a484c4b7 100644 --- a/drivers/usb/gadget/g_dnl.c +++ b/drivers/usb/gadget/g_dnl.c @@ -27,7 +27,7 @@ * CONFIG_G_DNL_VENDOR_NUM * CONFIG_G_DNL_PRODUCT_NUM * CONFIG_G_DNL_MANUFACTURER - * at e.g. ./include/configs/.h + * at e.g. ./configs/_defconfig */ #define STRING_MANUFACTURER 25 diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index cd78a0644f..1b1684d7bf 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -318,11 +318,6 @@ #define CONFIG_USB_ETH_RNDIS #define CONFIG_USBNET_HOST_ADDR "de:ad:be:af:00:00" #endif /* CONFIG_DM_ETH */ - -/* USB TI's IDs */ -#define CONFIG_G_DNL_VENDOR_NUM 0x0451 -#define CONFIG_G_DNL_PRODUCT_NUM 0xD022 -#define CONFIG_G_DNL_MANUFACTURER "Texas Instruments" #endif /* CONFIG_USB_MUSB_GADGET */ /* diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 7586019c0c..5d5ae5e03d 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -121,7 +121,6 @@ #define CONFIG_AM437X_USB2PHY2_HOST #endif -/* USB GADGET */ #if defined(CONFIG_SPL_BUILD) && !defined(CONFIG_SPL_USBETH_SUPPORT) #undef CONFIG_USB_DWC3_PHY_OMAP #undef CONFIG_USB_DWC3_OMAP @@ -130,16 +129,12 @@ #undef CONFIG_USB_GADGET_DOWNLOAD #undef CONFIG_USB_GADGET_VBUS_DRAW +#undef CONFIG_G_DNL_MANUFACTURER +#undef CONFIG_G_DNL_VENDOR_NUM +#undef CONFIG_G_DNL_PRODUCT_NUM #undef CONFIG_USB_GADGET_DUALSPEED #endif -#if !defined(CONFIG_SPL_BUILD) || \ - (defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT)) -#define CONFIG_G_DNL_MANUFACTURER "Texas Instruments" -#define CONFIG_G_DNL_VENDOR_NUM 0x0403 -#define CONFIG_G_DNL_PRODUCT_NUM 0xBD00 -#endif - /* * Disable MMC DM for SPL build and can be re-enabled after adding * DM support in SPL diff --git a/include/configs/baltos.h b/include/configs/baltos.h index 96a17dd141..48d0613a0b 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -288,11 +288,6 @@ #define CONFIG_USB_ETHER #define CONFIG_USB_ETH_RNDIS #define CONFIG_USBNET_HOST_ADDR "de:ad:be:af:00:00" - -/* USB TI's IDs */ -#define CONFIG_G_DNL_VENDOR_NUM 0x0403 -#define CONFIG_G_DNL_PRODUCT_NUM 0xBD00 -#define CONFIG_G_DNL_MANUFACTURER "Texas Instruments" #endif /* CONFIG_USB_MUSB_GADGET */ #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT) diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index b466d48e68..2c0ec9df9f 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -465,11 +465,6 @@ DEFAULT_LINUX_BOOT_ENV \ #ifdef CONFIG_USB_MUSB_GADGET #define CONFIG_CMD_USB_MASS_STORAGE #define CONFIG_USB_FUNCTION_MASS_STORAGE - -/* USB TI's IDs */ -#define CONFIG_G_DNL_VENDOR_NUM 0x0451 -#define CONFIG_G_DNL_PRODUCT_NUM 0xD022 -#define CONFIG_G_DNL_MANUFACTURER "Texas Instruments" #endif /* CONFIG_USB_MUSB_GADGET */ #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT) diff --git a/include/configs/bcm28155_ap.h b/include/configs/bcm28155_ap.h index 680ef1652f..bd83aabea7 100644 --- a/include/configs/bcm28155_ap.h +++ b/include/configs/bcm28155_ap.h @@ -140,8 +140,5 @@ #define CONFIG_FASTBOOT_BUF_ADDR CONFIG_SYS_SDRAM_BASE #define CONFIG_USB_GADGET_BCM_UDC_OTG_PHY #define CONFIG_USBID_ADDR 0x34052c46 -#define CONFIG_G_DNL_VENDOR_NUM 0x18d1 /* google */ -#define CONFIG_G_DNL_PRODUCT_NUM 0x0d02 /* nexus one */ -#define CONFIG_G_DNL_MANUFACTURER "Broadcom Corporation" #endif /* __BCM28155_AP_H */ diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h index 403de8403a..1ac9dca672 100644 --- a/include/configs/cgtqmx6eval.h +++ b/include/configs/cgtqmx6eval.h @@ -91,10 +91,6 @@ #define CONFIG_CMD_USB_MASS_STORAGE #define CONFIG_USB_FUNCTION_MASS_STORAGE -#define CONFIG_G_DNL_VENDOR_NUM 0x0525 -#define CONFIG_G_DNL_PRODUCT_NUM 0xa4a5 -#define CONFIG_G_DNL_MANUFACTURER "Congatec" - /* USB Device Firmware Update support */ #define CONFIG_CMD_DFU #define CONFIG_USB_FUNCTION_DFU diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 74a3874ead..227519f9e0 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -238,9 +238,6 @@ #define CONFIG_TRDX_PID_COLIBRI_VF61 0x0017 #define CONFIG_TRDX_PID_COLIBRI_VF61IT 0x0018 #define CONFIG_TRDX_PID_COLIBRI_VF50IT 0x0019 -#define CONFIG_G_DNL_MANUFACTURER "Toradex" -#define CONFIG_G_DNL_VENDOR_NUM CONFIG_TRDX_VID -#define CONFIG_G_DNL_PRODUCT_NUM CONFIG_TRDX_PID_COLIBRI_VF50 /* USB DFU */ #define CONFIG_CMD_DFU diff --git a/include/configs/corvus.h b/include/configs/corvus.h index 0b28529b4a..a5255558da 100644 --- a/include/configs/corvus.h +++ b/include/configs/corvus.h @@ -124,11 +124,6 @@ #define CONFIG_SYS_DFU_DATA_BUF_SIZE (SZ_1M) #define DFU_MANIFEST_POLL_TIMEOUT 25000 -/* USB DFU IDs */ -#define CONFIG_G_DNL_VENDOR_NUM 0x0908 -#define CONFIG_G_DNL_PRODUCT_NUM 0x02d2 -#define CONFIG_G_DNL_MANUFACTURER "Siemens AG" - #define CONFIG_SYS_CACHELINE_SIZE SZ_8K #define CONFIG_SYS_LOAD_ADDR ATMEL_BASE_CS6 diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 8d820f44c9..d2d16a62e3 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -226,11 +226,6 @@ #define CONFIG_OMAP_USB_PHY #define CONFIG_OMAP_USB2PHY2_HOST -/* USB GADGET */ -#define CONFIG_G_DNL_MANUFACTURER "Texas Instruments" -#define CONFIG_G_DNL_VENDOR_NUM 0x0451 -#define CONFIG_G_DNL_PRODUCT_NUM 0xd022 - /* USB Device Firmware Update support */ #define CONFIG_USB_FUNCTION_DFU #define CONFIG_DFU_RAM diff --git a/include/configs/exynos4-common.h b/include/configs/exynos4-common.h index a0f4aa8790..8522a7992f 100644 --- a/include/configs/exynos4-common.h +++ b/include/configs/exynos4-common.h @@ -37,13 +37,10 @@ #define DFU_DEFAULT_POLL_TIMEOUT 300 /* USB Samsung's IDs */ -#define CONFIG_G_DNL_VENDOR_NUM 0x04E8 -#define CONFIG_G_DNL_PRODUCT_NUM 0x6601 -#define CONFIG_G_DNL_THOR_VENDOR_NUM CONFIG_G_DNL_VENDOR_NUM +#define CONFIG_G_DNL_THOR_VENDOR_NUM 0x04E8 #define CONFIG_G_DNL_THOR_PRODUCT_NUM 0x685D #define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525 #define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5 -#define CONFIG_G_DNL_MANUFACTURER "Samsung" #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors */ diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 0921093056..747eafc240 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -194,11 +194,6 @@ #define CONFIG_CMD_USB_MASS_STORAGE #define CONFIG_USB_FUNCTION_MASS_STORAGE -/* Netchip IDs */ -#define CONFIG_G_DNL_VENDOR_NUM 0x0525 -#define CONFIG_G_DNL_PRODUCT_NUM 0xa4a5 -#define CONFIG_G_DNL_MANUFACTURER "Gateworks" - /* Framebuffer and LCD */ #define CONFIG_VIDEO #define CONFIG_VIDEO_IPUV3 diff --git a/include/configs/kc1.h b/include/configs/kc1.h index ab4cbabd3d..6cbafdd911 100644 --- a/include/configs/kc1.h +++ b/include/configs/kc1.h @@ -184,14 +184,6 @@ #define CONFIG_USB_MUSB_PIO_ONLY #define CONFIG_USB_MUSB_OMAP2PLUS -/* - * Download - */ - -#define CONFIG_G_DNL_VENDOR_NUM 0x0451 -#define CONFIG_G_DNL_PRODUCT_NUM 0xd022 -#define CONFIG_G_DNL_MANUFACTURER "Texas Instruments" - /* * Fastboot */ diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index 8d8612d7df..87bbf2e00c 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -239,10 +239,6 @@ #define CONFIG_CMD_USB_MASS_STORAGE #define CONFIG_USB_FUNCTION_MASS_STORAGE -#define CONFIG_G_DNL_VENDOR_NUM 0x0525 -#define CONFIG_G_DNL_PRODUCT_NUM 0xa4a5 -#define CONFIG_G_DNL_MANUFACTURER "FSL" - #define CONFIG_USB_FUNCTION_FASTBOOT #define CONFIG_CMD_FASTBOOT #define CONFIG_ANDROID_BOOT_IMAGE diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h index f62e1d4024..ad87b2491a 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -262,10 +262,6 @@ #define CONFIG_CMD_USB_MASS_STORAGE #define CONFIG_USB_FUNCTION_MASS_STORAGE -#define CONFIG_G_DNL_VENDOR_NUM 0x0525 -#define CONFIG_G_DNL_PRODUCT_NUM 0xa4a5 -#define CONFIG_G_DNL_MANUFACTURER "FSL" - /* USB Device Firmware Update support */ #define CONFIG_CMD_DFU #define CONFIG_USB_FUNCTION_DFU diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index f906bf241b..cb249c0def 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -331,11 +331,6 @@ #define CONFIG_CMD_USB_MASS_STORAGE #define CONFIG_USB_FUNCTION_MASS_STORAGE -/* Netchip IDs */ -#define CONFIG_G_DNL_VENDOR_NUM 0x0525 -#define CONFIG_G_DNL_PRODUCT_NUM 0xa4a5 -#define CONFIG_G_DNL_MANUFACTURER "Boundary" - #define CONFIG_USB_FUNCTION_FASTBOOT #define CONFIG_CMD_FASTBOOT #define CONFIG_ANDROID_BOOT_IMAGE diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h index 76131cd901..e52d7ba04a 100644 --- a/include/configs/odroid_xu3.h +++ b/include/configs/odroid_xu3.h @@ -47,11 +47,6 @@ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_EXYNOS -/* Downloader */ -#define CONFIG_G_DNL_VENDOR_NUM 0x04E8 -#define CONFIG_G_DNL_PRODUCT_NUM 0x6601 -#define CONFIG_G_DNL_MANUFACTURER "Samsung" - /* DFU */ #define CONFIG_USB_FUNCTION_DFU #define CONFIG_DFU_MMC diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index aec835276b..3fa8d7e385 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -64,9 +64,6 @@ #define CONFIG_TWL4030_USB 1 #define CONFIG_USB_ETHER #define CONFIG_USB_ETHER_RNDIS -#define CONFIG_G_DNL_VENDOR_NUM 0x0451 -#define CONFIG_G_DNL_PRODUCT_NUM 0xd022 -#define CONFIG_G_DNL_MANUFACTURER "TI" #define CONFIG_USB_FUNCTION_FASTBOOT #define CONFIG_CMD_FASTBOOT #define CONFIG_ANDROID_BOOT_IMAGE diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index 9337b890f7..0cb62e9057 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -83,9 +83,6 @@ #define CONFIG_USB_MUSB_PIO_ONLY #define CONFIG_USB_ETHER #define CONFIG_USB_ETHER_RNDIS -#define CONFIG_G_DNL_VENDOR_NUM 0x0451 -#define CONFIG_G_DNL_PRODUCT_NUM 0xd022 -#define CONFIG_G_DNL_MANUFACTURER "TI" #define CONFIG_USB_FUNCTION_FASTBOOT #define CONFIG_CMD_FASTBOOT #define CONFIG_ANDROID_BOOT_IMAGE diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h index bf922120a5..10b97a02dd 100644 --- a/include/configs/omap5_uevm.h +++ b/include/configs/omap5_uevm.h @@ -99,11 +99,6 @@ #define CONFIG_OMAP_EHCI_PHY2_RESET_GPIO 80 #define CONFIG_OMAP_EHCI_PHY3_RESET_GPIO 79 -/* USB GADGET */ -#define CONFIG_G_DNL_MANUFACTURER "Texas Instruments" -#define CONFIG_G_DNL_VENDOR_NUM 0x0403 -#define CONFIG_G_DNL_PRODUCT_NUM 0xBD00 - /* USB Device Firmware Update support */ #define CONFIG_USB_FUNCTION_DFU #define CONFIG_DFU_RAM diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index d101cf20f4..8520423fe5 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -80,13 +80,11 @@ #define CONFIG_USB_FUNCTION_THOR /* USB Samsung's IDs */ -#define CONFIG_G_DNL_VENDOR_NUM 0x04E8 -#define CONFIG_G_DNL_PRODUCT_NUM 0x6601 -#define CONFIG_G_DNL_THOR_VENDOR_NUM CONFIG_G_DNL_VENDOR_NUM + +#define CONFIG_G_DNL_THOR_VENDOR_NUM 0x04E8 #define CONFIG_G_DNL_THOR_PRODUCT_NUM 0x685D #define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525 #define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5 -#define CONFIG_G_DNL_MANUFACTURER "Samsung" /* Actual modem binary size is 16MiB. Add 2MiB for bad block handling */ #define MTDIDS_DEFAULT "onenand0=samsung-onenand" diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index d630f043d4..5b94fad107 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -243,9 +243,6 @@ /* USB DRACO ID as default */ #define CONFIG_USBD_HS -#define CONFIG_G_DNL_VENDOR_NUM 0x0908 -#define CONFIG_G_DNL_PRODUCT_NUM 0x02d2 -#define CONFIG_G_DNL_MANUFACTURER "Siemens AG" /* USB Device Firmware Update support */ #define CONFIG_USB_FUNCTION_DFU diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index bafa8e3d3a..0352379c04 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -178,11 +178,6 @@ #define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_1M #define DFU_MANIFEST_POLL_TIMEOUT 25000 -/* USB DFU IDs */ -#define CONFIG_G_DNL_VENDOR_NUM 0x0908 -#define CONFIG_G_DNL_PRODUCT_NUM 0x02d2 -#define CONFIG_G_DNL_MANUFACTURER "Siemens AG" - #define CONFIG_SYS_CACHELINE_SIZE 0x2000 #endif diff --git a/include/configs/sniper.h b/include/configs/sniper.h index e61b115430..2d82a66b09 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -201,14 +201,6 @@ #define CONFIG_USB_MUSB_OMAP2PLUS #define CONFIG_TWL4030_USB -/* - * Download - */ - -#define CONFIG_G_DNL_VENDOR_NUM 0x0451 -#define CONFIG_G_DNL_PRODUCT_NUM 0xd022 -#define CONFIG_G_DNL_MANUFACTURER "Texas Instruments" - /* * Fastboot */ diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 2da40f3320..0c94bac5a4 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -260,13 +260,8 @@ unsigned int cm_get_qspi_controller_clk_hz(void); #define DFU_DEFAULT_POLL_TIMEOUT 300 /* USB IDs */ -#define CONFIG_G_DNL_VENDOR_NUM 0x0525 /* NetChip */ -#define CONFIG_G_DNL_PRODUCT_NUM 0xA4A5 /* Linux-USB File-backed Storage Gadget */ -#define CONFIG_G_DNL_UMS_VENDOR_NUM CONFIG_G_DNL_VENDOR_NUM -#define CONFIG_G_DNL_UMS_PRODUCT_NUM CONFIG_G_DNL_PRODUCT_NUM -#ifndef CONFIG_G_DNL_MANUFACTURER -#define CONFIG_G_DNL_MANUFACTURER CONFIG_SYS_VENDOR -#endif +#define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525 +#define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5 #endif /* diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 6e880a7e03..9c6c9b63c7 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -342,9 +342,6 @@ extern int soft_i2c_gpio_scl; #endif #ifdef CONFIG_USB_MUSB_GADGET -#define CONFIG_G_DNL_VENDOR_NUM 0x1f3a -#define CONFIG_G_DNL_PRODUCT_NUM 0x1010 -#define CONFIG_G_DNL_MANUFACTURER "Allwinner Technology" #define CONFIG_USB_FUNCTION_DFU #define CONFIG_USB_FUNCTION_FASTBOOT #define CONFIG_USB_FUNCTION_MASS_STORAGE diff --git a/include/configs/taurus.h b/include/configs/taurus.h index 422b7a1722..405ed72a69 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -142,11 +142,6 @@ #define CONFIG_SYS_DFU_DATA_BUF_SIZE (SZ_1M) #define DFU_MANIFEST_POLL_TIMEOUT 25000 -/* USB DFU IDs */ -#define CONFIG_G_DNL_VENDOR_NUM 0x0908 -#define CONFIG_G_DNL_PRODUCT_NUM 0x02d2 -#define CONFIG_G_DNL_MANUFACTURER "Siemens AG" - #define CONFIG_SYS_CACHELINE_SIZE SZ_8K #endif diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index 19f35bb600..d0734a7246 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -130,9 +130,6 @@ #ifdef CONFIG_CMD_USB_MASS_STORAGE #define CONFIG_USBD_HS #define CONFIG_USB_FUNCTION_MASS_STORAGE -#define CONFIG_G_DNL_VENDOR_NUM 0x0525 -#define CONFIG_G_DNL_PRODUCT_NUM 0xa4a5 -#define CONFIG_G_DNL_MANUFACTURER "TBS" #endif /* CONFIG_CMD_USB_MASS_STORAGE */ #define CONFIG_USB_KEYBOARD #ifdef CONFIG_USB_KEYBOARD diff --git a/include/configs/tegra-common-usb-gadget.h b/include/configs/tegra-common-usb-gadget.h index 6b1247c5e0..18851ca3d0 100644 --- a/include/configs/tegra-common-usb-gadget.h +++ b/include/configs/tegra-common-usb-gadget.h @@ -11,15 +11,6 @@ #ifndef CONFIG_SPL_BUILD /* USB gadget mode support*/ #define CONFIG_CI_UDC_HAS_HOSTPC -#ifndef CONFIG_G_DNL_VENDOR_NUM -#define CONFIG_G_DNL_VENDOR_NUM 0x0955 -#endif -#ifndef CONFIG_G_DNL_PRODUCT_NUM -#define CONFIG_G_DNL_PRODUCT_NUM 0x701A -#endif -#ifndef CONFIG_G_DNL_MANUFACTURER -#define CONFIG_G_DNL_MANUFACTURER "NVIDIA" -#endif /* USB mass storage protocol */ #define CONFIG_USB_FUNCTION_MASS_STORAGE #define CONFIG_CMD_USB_MASS_STORAGE diff --git a/include/configs/warp.h b/include/configs/warp.h index 11ebbeb79a..4c3df1dec4 100644 --- a/include/configs/warp.h +++ b/include/configs/warp.h @@ -79,10 +79,6 @@ #define CONFIG_CMD_USB_MASS_STORAGE #define CONFIG_USB_FUNCTION_MASS_STORAGE -#define CONFIG_G_DNL_VENDOR_NUM 0x0525 -#define CONFIG_G_DNL_PRODUCT_NUM 0xa4a5 -#define CONFIG_G_DNL_MANUFACTURER "FSL" - #define CONFIG_CMD_DFU #define CONFIG_USB_FUNCTION_DFU #define CONFIG_DFU_MMC diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 63165df18c..980fcb2df5 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -126,9 +126,6 @@ #define DFU_DEFAULT_POLL_TIMEOUT 300 #define CONFIG_USB_FUNCTION_DFU #define CONFIG_DFU_RAM -#define CONFIG_G_DNL_VENDOR_NUM 0x03FD -#define CONFIG_G_DNL_PRODUCT_NUM 0x0300 -#define CONFIG_G_DNL_MANUFACTURER "Xilinx" #define CONFIG_USB_CABLE_CHECK #define CONFIG_CMD_DFU #define CONFIG_CMD_THOR_DOWNLOAD diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 450d487b5b..23b1b2df45 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -102,9 +102,6 @@ # define DFU_DEFAULT_POLL_TIMEOUT 300 # define CONFIG_USB_FUNCTION_DFU # define CONFIG_DFU_RAM -# define CONFIG_G_DNL_VENDOR_NUM 0x03FD -# define CONFIG_G_DNL_PRODUCT_NUM 0x0300 -# define CONFIG_G_DNL_MANUFACTURER "Xilinx" # define CONFIG_USB_CABLE_CHECK # define CONFIG_CMD_DFU # define CONFIG_CMD_THOR_DOWNLOAD -- 2.25.1