Skip to content
Snippets Groups Projects
Commit e6c0bc06 authored by Sam Protsenko's avatar Sam Protsenko Committed by Marek Vasut
Browse files

usb: gadget Move: CONFIG_G_DNL_* to Kconfig 


And also reformat defconfigs using "make savedefconfig" rule.

Signed-off-by: default avatarSam Protsenko <semen.protsenko@linaro.org>
parent b142729d
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 53 additions and 31 deletions
configs/tbs2910_defconfig
+ 3
− 0
View file @ e6c0bc06
...@@ -12,4 +12,7 @@ CONFIG_USB=y ...@@ -12,4 +12,7 @@ CONFIG_USB=y
CONFIG_USB_GADGET=y CONFIG_USB_GADGET=y
CONFIG_CI_UDC=y CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=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 CONFIG_OF_LIBFDT=y
configs/thuban_defconfig
+ 3
− 0
View file @ e6c0bc06
...@@ -16,4 +16,7 @@ CONFIG_USB=y ...@@ -16,4 +16,7 @@ CONFIG_USB=y
CONFIG_USB_MUSB_GADGET=y CONFIG_USB_MUSB_GADGET=y
CONFIG_USB_GADGET=y CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_DOWNLOAD=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 CONFIG_OF_LIBFDT=y
configs/trats2_defconfig
+ 3
− 0
View file @ e6c0bc06
...@@ -18,3 +18,6 @@ CONFIG_DM_USB=y ...@@ -18,3 +18,6 @@ CONFIG_DM_USB=y
CONFIG_USB_GADGET=y CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Samsung"
CONFIG_G_DNL_VENDOR_NUM=0x04e8
CONFIG_G_DNL_PRODUCT_NUM=0x6601
configs/trats_defconfig
+ 3
− 0
View file @ e6c0bc06
...@@ -17,3 +17,6 @@ CONFIG_DM_USB=y ...@@ -17,3 +17,6 @@ CONFIG_DM_USB=y
CONFIG_USB_GADGET=y CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DWC2_OTG=y
CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Samsung"
CONFIG_G_DNL_VENDOR_NUM=0x04e8
CONFIG_G_DNL_PRODUCT_NUM=0x6601
configs/venice2_defconfig
+ 3
− 0
View file @ e6c0bc06
...@@ -22,4 +22,7 @@ CONFIG_DM_USB=y ...@@ -22,4 +22,7 @@ CONFIG_DM_USB=y
CONFIG_USB_GADGET=y CONFIG_USB_GADGET=y
CONFIG_CI_UDC=y CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=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 CONFIG_USE_PRIVATE_LIBGCC=y
configs/warp_defconfig
+ 3
− 0
View file @ e6c0bc06
...@@ -12,4 +12,7 @@ CONFIG_USB=y ...@@ -12,4 +12,7 @@ CONFIG_USB=y
CONFIG_USB_GADGET=y CONFIG_USB_GADGET=y
CONFIG_CI_UDC=y CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=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 CONFIG_OF_LIBFDT=y
configs/xilinx_zynqmp_ep_defconfig
+ 3
− 0
View file @ e6c0bc06
...@@ -42,4 +42,7 @@ CONFIG_USB_DWC3=y ...@@ -42,4 +42,7 @@ CONFIG_USB_DWC3=y
CONFIG_USB_DWC3_GADGET=y CONFIG_USB_DWC3_GADGET=y
CONFIG_USB_GADGET=y CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_DOWNLOAD=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 # CONFIG_REGEX is not set
configs/zynq_picozed_defconfig
+ 3
− 0
View file @ e6c0bc06
...@@ -18,3 +18,6 @@ CONFIG_USB_ULPI=y ...@@ -18,3 +18,6 @@ CONFIG_USB_ULPI=y
CONFIG_USB_GADGET=y CONFIG_USB_GADGET=y
CONFIG_CI_UDC=y CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Xilinx"
CONFIG_G_DNL_VENDOR_NUM=0x03fd
CONFIG_G_DNL_PRODUCT_NUM=0x0300
configs/zynq_zc702_defconfig
+ 3
− 0
View file @ e6c0bc06
...@@ -30,3 +30,6 @@ CONFIG_USB_ULPI=y ...@@ -30,3 +30,6 @@ CONFIG_USB_ULPI=y
CONFIG_USB_GADGET=y CONFIG_USB_GADGET=y
CONFIG_CI_UDC=y CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Xilinx"
CONFIG_G_DNL_VENDOR_NUM=0x03fd
CONFIG_G_DNL_PRODUCT_NUM=0x0300
configs/zynq_zc706_defconfig
+ 3
− 0
View file @ e6c0bc06
...@@ -27,3 +27,6 @@ CONFIG_USB_ULPI=y ...@@ -27,3 +27,6 @@ CONFIG_USB_ULPI=y
CONFIG_USB_GADGET=y CONFIG_USB_GADGET=y
CONFIG_CI_UDC=y CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Xilinx"
CONFIG_G_DNL_VENDOR_NUM=0x03fd
CONFIG_G_DNL_PRODUCT_NUM=0x0300
configs/zynq_zed_defconfig
+ 3
− 0
View file @ e6c0bc06
...@@ -27,3 +27,6 @@ CONFIG_USB_ULPI=y ...@@ -27,3 +27,6 @@ CONFIG_USB_ULPI=y
CONFIG_USB_GADGET=y CONFIG_USB_GADGET=y
CONFIG_CI_UDC=y CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Xilinx"
CONFIG_G_DNL_VENDOR_NUM=0x03fd
CONFIG_G_DNL_PRODUCT_NUM=0x0300
configs/zynq_zybo_defconfig
+ 3
− 0
View file @ e6c0bc06
...@@ -29,3 +29,6 @@ CONFIG_USB_ULPI=y ...@@ -29,3 +29,6 @@ CONFIG_USB_ULPI=y
CONFIG_USB_GADGET=y CONFIG_USB_GADGET=y
CONFIG_CI_UDC=y CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Xilinx"
CONFIG_G_DNL_VENDOR_NUM=0x03fd
CONFIG_G_DNL_PRODUCT_NUM=0x0300
drivers/usb/gadget/Kconfig
+ 13
− 0
View file @ e6c0bc06
...@@ -86,4 +86,17 @@ config USB_GADGET_DOWNLOAD ...@@ -86,4 +86,17 @@ config USB_GADGET_DOWNLOAD
Composite USB download gadget support (g_dnl) for download functions. Composite USB download gadget support (g_dnl) for download functions.
This code works on top of composite gadget. 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 endif # USB_GADGET
drivers/usb/gadget/g_dnl.c
+ 1
− 1
View file @ e6c0bc06
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
* CONFIG_G_DNL_VENDOR_NUM * CONFIG_G_DNL_VENDOR_NUM
* CONFIG_G_DNL_PRODUCT_NUM * CONFIG_G_DNL_PRODUCT_NUM
* CONFIG_G_DNL_MANUFACTURER * CONFIG_G_DNL_MANUFACTURER
* at e.g. ./include/configs/<board>.h * at e.g. ./configs/<board>_defconfig
*/ */
#define STRING_MANUFACTURER 25 #define STRING_MANUFACTURER 25
......
include/configs/am335x_evm.h
+ 0
− 5
View file @ e6c0bc06
...@@ -318,11 +318,6 @@ ...@@ -318,11 +318,6 @@
#define CONFIG_USB_ETH_RNDIS #define CONFIG_USB_ETH_RNDIS
#define CONFIG_USBNET_HOST_ADDR "de:ad:be:af:00:00" #define CONFIG_USBNET_HOST_ADDR "de:ad:be:af:00:00"
#endif /* CONFIG_DM_ETH */ #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 */ #endif /* CONFIG_USB_MUSB_GADGET */
/* /*
......
include/configs/am43xx_evm.h
+ 3
− 8
View file @ e6c0bc06
...@@ -121,7 +121,6 @@ ...@@ -121,7 +121,6 @@
#define CONFIG_AM437X_USB2PHY2_HOST #define CONFIG_AM437X_USB2PHY2_HOST
#endif #endif
/* USB GADGET */
#if defined(CONFIG_SPL_BUILD) && !defined(CONFIG_SPL_USBETH_SUPPORT) #if defined(CONFIG_SPL_BUILD) && !defined(CONFIG_SPL_USBETH_SUPPORT)
#undef CONFIG_USB_DWC3_PHY_OMAP #undef CONFIG_USB_DWC3_PHY_OMAP
#undef CONFIG_USB_DWC3_OMAP #undef CONFIG_USB_DWC3_OMAP
...@@ -130,16 +129,12 @@ ...@@ -130,16 +129,12 @@
#undef CONFIG_USB_GADGET_DOWNLOAD #undef CONFIG_USB_GADGET_DOWNLOAD
#undef CONFIG_USB_GADGET_VBUS_DRAW #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 #undef CONFIG_USB_GADGET_DUALSPEED
#endif #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 * Disable MMC DM for SPL build and can be re-enabled after adding
* DM support in SPL * DM support in SPL
......
include/configs/baltos.h
+ 0
− 5
View file @ e6c0bc06
...@@ -288,11 +288,6 @@ ...@@ -288,11 +288,6 @@
#define CONFIG_USB_ETHER #define CONFIG_USB_ETHER
#define CONFIG_USB_ETH_RNDIS #define CONFIG_USB_ETH_RNDIS
#define CONFIG_USBNET_HOST_ADDR "de:ad:be:af:00:00" #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 */ #endif /* CONFIG_USB_MUSB_GADGET */
#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT) #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT)
......
include/configs/bav335x.h
+ 0
− 5
View file @ e6c0bc06
...@@ -465,11 +465,6 @@ DEFAULT_LINUX_BOOT_ENV \ ...@@ -465,11 +465,6 @@ DEFAULT_LINUX_BOOT_ENV \
#ifdef CONFIG_USB_MUSB_GADGET #ifdef CONFIG_USB_MUSB_GADGET
#define CONFIG_CMD_USB_MASS_STORAGE #define CONFIG_CMD_USB_MASS_STORAGE
#define CONFIG_USB_FUNCTION_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 */ #endif /* CONFIG_USB_MUSB_GADGET */
#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT) #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT)
......
include/configs/bcm28155_ap.h
+ 0
− 3
View file @ e6c0bc06
...@@ -140,8 +140,5 @@ ...@@ -140,8 +140,5 @@
#define CONFIG_FASTBOOT_BUF_ADDR CONFIG_SYS_SDRAM_BASE #define CONFIG_FASTBOOT_BUF_ADDR CONFIG_SYS_SDRAM_BASE
#define CONFIG_USB_GADGET_BCM_UDC_OTG_PHY #define CONFIG_USB_GADGET_BCM_UDC_OTG_PHY
#define CONFIG_USBID_ADDR 0x34052c46 #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 */ #endif /* __BCM28155_AP_H */
include/configs/cgtqmx6eval.h
+ 0
− 4
View file @ e6c0bc06
...@@ -91,10 +91,6 @@ ...@@ -91,10 +91,6 @@
#define CONFIG_CMD_USB_MASS_STORAGE #define CONFIG_CMD_USB_MASS_STORAGE
#define CONFIG_USB_FUNCTION_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 */ /* USB Device Firmware Update support */
#define CONFIG_CMD_DFU #define CONFIG_CMD_DFU
#define CONFIG_USB_FUNCTION_DFU #define CONFIG_USB_FUNCTION_DFU
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment