configs: i.MX6: Move USB Manufacturer, VID, PID to Kconfig

PATCH New Jagan Teki 1 participant 1 message Mar 13, 2018

Subsystems (2)

USB Arm i.MX and Layerscape

lore

Share & tools

lore

Jagan Teki

author

2018-03-13 05:24 UTC #0 lore raw

PATCH 1/1 configs: i.MX6: Move USB Manufacturer, VID, PID to Kconfig

Define i.MX6 defaults for USB_GADGET_MANUFACTURER|VENDOR_NUM|PRODUCT_NUM instead of redundant defines in defconfig files.

Signed-off-by Jagan Teki <[email protected]>

---
 configs/cgtqmx6eval_defconfig      | 2 --
 configs/dh_imx6_defconfig          | 2 --
 configs/dms-ba16-1g_defconfig      | 2 --
 configs/dms-ba16_defconfig         | 2 --
 configs/gwventana_emmc_defconfig   | 2 --
 configs/gwventana_gw5904_defconfig | 2 --
 configs/gwventana_nand_defconfig   | 2 --
 configs/mx6memcal_defconfig        | 3 ---
 configs/mx6qsabrelite_defconfig    | 2 --
 configs/mx6sabreauto_defconfig     | 3 ---
 configs/mx6sabresd_defconfig       | 3 ---
 configs/nitrogen6dl2g_defconfig    | 2 --
 configs/nitrogen6dl_defconfig      | 2 --
 configs/nitrogen6q2g_defconfig     | 2 --
 configs/nitrogen6q_defconfig       | 2 --
 configs/nitrogen6s1g_defconfig     | 2 --
 configs/nitrogen6s_defconfig       | 2 --
 configs/opos6uldev_defconfig       | 2 --
 configs/pico-imx6ul_defconfig      | 3 ---
 configs/tbs2910_defconfig          | 2 --
 configs/warp_defconfig             | 3 ---
 drivers/usb/gadget/Kconfig         | 3 +++
 22 files changed, 3 insertions(+), 47 deletions(-)

configs/cgtqmx6eval_defconfig +0 -2

index 2ac0bac0b6..65d96e52e7 100644
@@ -57,8 +57,6 @@ CONFIG_USB_KEYBOARD=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Congatec"
-CONFIG_USB_GADGET_VENDOR_NUM=0x0525
-CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_CI_UDC=y
 CONFIG_USB_HOST_ETHER=y
 CONFIG_USB_ETHER_ASIX=y

configs/dh_imx6_defconfig +0 -2

index 2b4fe9c2c5..01f805f443 100644
@@ -48,8 +48,6 @@ CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="dh"
-CONFIG_USB_GADGET_VENDOR_NUM=0x0525
-CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/dms-ba16-1g_defconfig +0 -2

index 40b317093f..311da5db5f 100644
@@ -40,8 +40,6 @@ CONFIG_USB_KEYBOARD=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Advantech"
-CONFIG_USB_GADGET_VENDOR_NUM=0x0525
-CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_VIDEO=y

configs/dms-ba16_defconfig +0 -2

index 3519c5275c..ca0ac8d7be 100644
@@ -39,8 +39,6 @@ CONFIG_USB_KEYBOARD=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Advantech"
-CONFIG_USB_GADGET_VENDOR_NUM=0x0525
-CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_VIDEO=y

configs/gwventana_emmc_defconfig +0 -2

index a6db1040b6..f50f4f83ae 100644
@@ -66,8 +66,6 @@ CONFIG_USB_KEYBOARD=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Gateworks"
-CONFIG_USB_GADGET_VENDOR_NUM=0x0525
-CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_USB_ETHER=y

configs/gwventana_gw5904_defconfig +0 -2

index 41b93c8a07..0978086631 100644
@@ -70,8 +70,6 @@ CONFIG_USB_KEYBOARD=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Gateworks"
-CONFIG_USB_GADGET_VENDOR_NUM=0x0525
-CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_USB_ETHER=y

configs/gwventana_nand_defconfig +0 -2

index e513289583..9431f016ff 100644
@@ -70,8 +70,6 @@ CONFIG_USB_KEYBOARD=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Gateworks"
-CONFIG_USB_GADGET_VENDOR_NUM=0x0525
-CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_USB_ETHER=y

configs/mx6memcal_defconfig +0 -3

index fdcef6b65b..3fcb8518c4 100644
@@ -35,8 +35,5 @@ CONFIG_CMD_CACHE=y
 # CONFIG_MMC is not set
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_MANUFACTURER="FSL"
-CONFIG_USB_GADGET_VENDOR_NUM=0x0525
-CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_CI_UDC=y
 CONFIG_REGEX=y

configs/mx6qsabrelite_defconfig +0 -2

index 2b45dc17fd..6b509ecd7f 100644
@@ -49,8 +49,6 @@ CONFIG_USB_KEYBOARD=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Boundary"
-CONFIG_USB_GADGET_VENDOR_NUM=0x0525
-CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_CI_UDC=y
 CONFIG_USB_ETHER=y
 CONFIG_USB_ETH_CDC=y

configs/mx6sabreauto_defconfig +0 -3

index ee6ca57b00..882bb288c3 100644
@@ -50,9 +50,6 @@ CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_MANUFACTURER="FSL"
-CONFIG_USB_GADGET_VENDOR_NUM=0x0525
-CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_USB_HOST_ETHER=y

configs/mx6sabresd_defconfig +0 -3

index 83b8bed52b..97a611fc05 100644
@@ -59,9 +59,6 @@ CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_MANUFACTURER="FSL"
-CONFIG_USB_GADGET_VENDOR_NUM=0x0525
-CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_CI_UDC=y
 CONFIG_USB_HOST_ETHER=y
 CONFIG_USB_ETHER_ASIX=y

configs/nitrogen6dl2g_defconfig +0 -2

index c109aa3b97..ebce2161d7 100644
@@ -45,8 +45,6 @@ CONFIG_USB_KEYBOARD=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Boundary"
-CONFIG_USB_GADGET_VENDOR_NUM=0x0525
-CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_CI_UDC=y
 CONFIG_USB_ETHER=y
 CONFIG_USB_ETH_CDC=y

configs/nitrogen6dl_defconfig +0 -2

index 462229e159..446231d40e 100644
@@ -45,8 +45,6 @@ CONFIG_USB_KEYBOARD=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Boundary"
-CONFIG_USB_GADGET_VENDOR_NUM=0x0525
-CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_CI_UDC=y
 CONFIG_USB_ETHER=y
 CONFIG_USB_ETH_CDC=y

configs/nitrogen6q2g_defconfig +0 -2

index 79c8de3d8e..ed4f7019b4 100644
@@ -47,8 +47,6 @@ CONFIG_USB_KEYBOARD=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Boundary"
-CONFIG_USB_GADGET_VENDOR_NUM=0x0525
-CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_CI_UDC=y
 CONFIG_USB_ETHER=y
 CONFIG_USB_ETH_CDC=y

configs/nitrogen6q_defconfig +0 -2

index 2895b6e958..bd81fd70b8 100644
@@ -47,8 +47,6 @@ CONFIG_USB_KEYBOARD=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Boundary"
-CONFIG_USB_GADGET_VENDOR_NUM=0x0525
-CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_CI_UDC=y
 CONFIG_USB_ETHER=y
 CONFIG_USB_ETH_CDC=y

configs/nitrogen6s1g_defconfig +0 -2

index e7348af733..5fe265a617 100644
@@ -45,8 +45,6 @@ CONFIG_USB_KEYBOARD=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Boundary"
-CONFIG_USB_GADGET_VENDOR_NUM=0x0525
-CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_CI_UDC=y
 CONFIG_USB_ETHER=y
 CONFIG_USB_ETH_CDC=y

configs/nitrogen6s_defconfig +0 -2

index e9e9f73176..3d6760b58e 100644
@@ -45,8 +45,6 @@ CONFIG_USB_KEYBOARD=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Boundary"
-CONFIG_USB_GADGET_VENDOR_NUM=0x0525
-CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_CI_UDC=y
 CONFIG_USB_ETHER=y
 CONFIG_USB_ETH_CDC=y

configs/opos6uldev_defconfig +0 -2

index d4c8db23fd..0df73eb881 100644
@@ -78,8 +78,6 @@ CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Armadeus Systems"
-CONFIG_USB_GADGET_VENDOR_NUM=0x0525
-CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_VIDEO=y

configs/pico-imx6ul_defconfig +0 -3

index c6fa11a9b4..bf537020b5 100644
@@ -35,9 +35,6 @@ CONFIG_PHY_MICREL=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_MANUFACTURER="FSL"
-CONFIG_USB_GADGET_VENDOR_NUM=0x0525
-CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

configs/tbs2910_defconfig +0 -2

index 567f80be84..e84b2058be 100644
@@ -47,8 +47,6 @@ CONFIG_USB_KEYBOARD=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="TBS"
-CONFIG_USB_GADGET_VENDOR_NUM=0x0525
-CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_VIDEO=y

configs/warp_defconfig +0 -3

index bddf4bcf1d..49e6589b41 100644
@@ -30,9 +30,6 @@ CONFIG_DFU_MMC=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_MANUFACTURER="FSL"
-CONFIG_USB_GADGET_VENDOR_NUM=0x0525
-CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT=y

drivers/usb/gadget/Kconfig +3 -0

index 6825e6b543..38cddc2a7d 100644
@@ -39,6 +39,7 @@ if USB_GADGET
 config USB_GADGET_MANUFACTURER
 	string "Vendor name of the USB device"
 	default "Allwinner Technology" if ARCH_SUNXI
+	default "FSL" if ARCH_MX6
 	default "U-Boot"
 	help
 	  Vendor name of the USB device emulated, reported to the host device.

@@ -47,6 +48,7 @@ config USB_GADGET_MANUFACTURER
 config USB_GADGET_VENDOR_NUM
 	hex "Vendor ID of the USB device"
 	default 0x1f3a if ARCH_SUNXI
+	default 0x0525 if ARCH_MX6
 	default 0x0
 	help
 	  Vendor ID of the USB device emulated, reported to the host device.

@@ -56,6 +58,7 @@ config USB_GADGET_VENDOR_NUM
 config USB_GADGET_PRODUCT_NUM
 	hex "Product ID of the USB device"
 	default 0x1010 if ARCH_SUNXI
+	default 0xa4a5 if ARCH_MX6
 	default 0x0
 	help
 	  Product ID of the USB device emulated, reported to the host device.

Signature · 1 line

2.14.3