summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2009-12-15 09:11:09 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2009-12-15 10:18:30 +0100
commita3ffa97f40dc81f2d6b07ee964f2340fe0c1ba97 (patch)
tree7a9076c1a20df00baeadca9a07d4c1f5cd0611e2 /drivers/usb
parentcaa5cec7b1c93d660aa89d24eb160ab18e4eb628 (diff)
downloadbarebox-a3ffa97f40dc81f2d6b07ee964f2340fe0c1ba97.tar.gz
barebox-a3ffa97f40dc81f2d6b07ee964f2340fe0c1ba97.tar.xz
rename U-Boot-v2 project to barebox
This has been done with the following script: find -path ./.git -prune -o -type f -print0 | xargs -0 -r sed -i \ -e 's/u2boot/barebox/g' \ -e 's/U2Boot/barebox/g' \ -e 's/U-boot V2/barebox/g' \ -e 's/u-boot v2/barebox/g' \ -e 's/U-Boot V2/barebox/g' \ -e 's/U-Boot-v2/barebox/g' \ -e 's/U_BOOT/BAREBOX/g' \ -e 's/UBOOT/BAREBOX/g' \ -e 's/uboot/barebox/g' \ -e 's/u-boot/barebox/g' \ -e 's/u_boot/barebox/g' \ -e 's/U-Boot/barebox/g' \ -e 's/U-boot/barebox/g' \ -e 's/U-BOOT/barebox/g' find -path ./.git -prune -o \( -name "*u-boot*" -o -name "*uboot*" -o -name "*u_boot*" \) -print0 | \ xargs -0 -r rename 's/u[-_]?boot/barebox/' It needs some manual fixup following in the next patch Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/gadget/serial.c2
-rw-r--r--drivers/usb/gadget/u_serial.c4
-rw-r--r--drivers/usb/usb.c10
3 files changed, 8 insertions, 8 deletions
diff --git a/drivers/usb/gadget/serial.c b/drivers/usb/gadget/serial.c
index 1b15178eae..f6a712b1c4 100644
--- a/drivers/usb/gadget/serial.c
+++ b/drivers/usb/gadget/serial.c
@@ -110,7 +110,7 @@ printf("%s\n", __func__);
*/
/* device description: manufacturer, product */
- sprintf(manufacturer, "u-boot with %s",
+ sprintf(manufacturer, "barebox with %s",
gadget->name);
status = usb_string_id(cdev);
if (status < 0)
diff --git a/drivers/usb/gadget/u_serial.c b/drivers/usb/gadget/u_serial.c
index 5b22e151b3..d3b49edafa 100644
--- a/drivers/usb/gadget/u_serial.c
+++ b/drivers/usb/gadget/u_serial.c
@@ -484,9 +484,9 @@ static int do_mycdev (cmd_tbl_t *cmdtp, int argc, char *argv[])
return 0;
}
-U_BOOT_CMD_START(mycdev)
+BAREBOX_CMD_START(mycdev)
.cmd = do_mycdev,
-U_BOOT_CMD_END
+BAREBOX_CMD_END
/**
* gserial_disconnect - notify TTY I/O glue that USB link is inactive
diff --git a/drivers/usb/usb.c b/drivers/usb/usb.c
index 208a38cdb7..decdbdd8e7 100644
--- a/drivers/usb/usb.c
+++ b/drivers/usb/usb.c
@@ -12,7 +12,7 @@
* (C) Copyright Yggdrasil Computing, Inc. 2000
* (usb_device_id matching changes by Adam J. Richter)
*
- * Adapted for U-Boot:
+ * Adapted for barebox:
* (C) Copyright 2001 Denis Peter, MPL AG Switzerland
*
* See file CREDITS for list of people who contributed to this
@@ -489,11 +489,11 @@ static const __maybe_unused char cmd_usb_help[] =
"Usage: usb\n"
"(re-)detect USB devices\n";
-U_BOOT_CMD_START(usb)
+BAREBOX_CMD_START(usb)
.cmd = do_usb,
.usage = "(re-)detect USB devices",
- U_BOOT_CMD_HELP(cmd_usb_help)
-U_BOOT_CMD_END
+ BAREBOX_CMD_HELP(cmd_usb_help)
+BAREBOX_CMD_END
/*
* disables the asynch behaviour of the control message. This is used for data
@@ -700,7 +700,7 @@ int usb_set_interface(struct usb_device *dev, int interface, int alternate)
* According to 9.4.10 of the Universal Serial Bus Specification
* Revision 2.0 such devices can return with a STALL. This results in
* some USB sticks timeouting during initialization and then being
- * unusable in U-Boot.
+ * unusable in barebox.
*/
if (if_face->num_altsetting == 1)
return 0;