Merge branch 'master' of git://git.denx.de/u-boot-arm

[u-boot] / common / cmd_usb.c

diff --git a/common/cmd_usb.c b/common/cmd_usb.c
index 320667f5fbcd873896d27ad73339715463b13dd1..a8e3ae5b67f8b00e6a2a83fd40c65fdc28fcd9b7 100644 (file)
--- a/common/cmd_usb.c
+++ b/common/cmd_usb.c
@@ -150,7 +150,8 @@ void usb_display_class_sub(unsigned char dclass, unsigned char subclass,
 
 void usb_display_string(struct usb_device *dev, int index)
 {
-       char buffer[256];
+       ALLOC_CACHE_ALIGN_BUFFER(char, buffer, 256);
+
        if (index != 0) {
                if (usb_string(dev, index, &buffer[0], 256) > 0)
                        printf("String: \"%s\"", buffer);
@@ -379,7 +380,7 @@ int do_usbboot(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                boot_device = argv[2];
                break;
        default:
-               return cmd_usage(cmdtp);
+               return CMD_RET_USAGE;
        }
 
        if (!boot_device) {
@@ -509,10 +510,11 @@ int do_usb(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 #endif
 
        if (argc < 2)
-               return cmd_usage(cmdtp);
+               return CMD_RET_USAGE;
 
        if ((strncmp(argv[1], "reset", 5) == 0) ||
                 (strncmp(argv[1], "start", 5) == 0)) {
+               bootstage_mark_name(BOOTSTAGE_ID_USB_START, "usb_start");
                usb_stop();
                printf("(Re)start USB...\n");
                i = usb_init();
@@ -694,7 +696,7 @@ int do_usb(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                return 0;
        }
 #endif /* CONFIG_USB_STORAGE */
-       return cmd_usage(cmdtp);
+       return CMD_RET_USAGE;
 }
 
 #ifdef CONFIG_USB_STORAGE