projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
usb: gadget: Make g_dnl USB settings common
[platform/kernel/u-boot.git]
/
drivers
/
usb
/
gadget
/
g_dnl.c
diff --git
a/drivers/usb/gadget/g_dnl.c
b/drivers/usb/gadget/g_dnl.c
index
039331a
..
99d500a
100644
(file)
--- a/
drivers/usb/gadget/g_dnl.c
+++ b/
drivers/usb/gadget/g_dnl.c
@@
-26,9
+26,9
@@
/*
* One needs to define the following:
/*
* One needs to define the following:
- * CONFIG_
G_DNL
_VENDOR_NUM
- * CONFIG_
G_DNL
_PRODUCT_NUM
- * CONFIG_
G_DNL
_MANUFACTURER
+ * CONFIG_
USB_GADGET
_VENDOR_NUM
+ * CONFIG_
USB_GADGET
_PRODUCT_NUM
+ * CONFIG_
USB_GADGET
_MANUFACTURER
* at e.g. ./configs/<board>_defconfig
*/
* at e.g. ./configs/<board>_defconfig
*/
@@
-46,7
+46,7
@@
static const char product[] = "USB download gadget";
static char g_dnl_serial[MAX_STRING_SERIAL];
static const char product[] = "USB download gadget";
static char g_dnl_serial[MAX_STRING_SERIAL];
-static const char manufacturer[] = CONFIG_
G_DNL
_MANUFACTURER;
+static const char manufacturer[] = CONFIG_
USB_GADGET
_MANUFACTURER;
void g_dnl_set_serialnumber(char *s)
{
void g_dnl_set_serialnumber(char *s)
{
@@
-62,8
+62,8
@@
static struct usb_device_descriptor device_desc = {
.bDeviceClass = USB_CLASS_PER_INTERFACE,
.bDeviceSubClass = 0, /*0x02:CDC-modem , 0x00:CDC-serial*/
.bDeviceClass = USB_CLASS_PER_INTERFACE,
.bDeviceSubClass = 0, /*0x02:CDC-modem , 0x00:CDC-serial*/
- .idVendor = __constant_cpu_to_le16(CONFIG_
G_DNL
_VENDOR_NUM),
- .idProduct = __constant_cpu_to_le16(CONFIG_
G_DNL
_PRODUCT_NUM),
+ .idVendor = __constant_cpu_to_le16(CONFIG_
USB_GADGET
_VENDOR_NUM),
+ .idProduct = __constant_cpu_to_le16(CONFIG_
USB_GADGET
_PRODUCT_NUM),
/* .iProduct = DYNAMIC */
/* .iSerialNumber = DYNAMIC */
.bNumConfigurations = 1,
/* .iProduct = DYNAMIC */
/* .iSerialNumber = DYNAMIC */
.bNumConfigurations = 1,