sandbox: config: enable fdt and snprintf() options

[u-boot] / common / cmd_usb.c

diff --git a/common/cmd_usb.c b/common/cmd_usb.c
index 8c87265668d73715bc1a8f872cc2af8514ac2111..4a86590f172a41b9c5029d77e98e19aa4fadb1ac 100644 (file)
--- a/common/cmd_usb.c
+++ b/common/cmd_usb.c
@@ -28,6 +28,7 @@
 #include <common.h>
 #include <command.h>
 #include <asm/byteorder.h>
+#include <asm/unaligned.h>
 #include <part.h>
 #include <usb.h>
 
@@ -240,7 +241,7 @@ void usb_display_ep_desc(struct usb_endpoint_descriptor *epdesc)
                printf("Interrupt");
                break;
        }
-       printf(" MaxPacket %d", epdesc->wMaxPacketSize);
+       printf(" MaxPacket %d", get_unaligned(&epdesc->wMaxPacketSize));
        if ((epdesc->bmAttributes & 0x03) == 0x3)
                printf(" Interval %dms", epdesc->bInterval);
        printf("\n");
@@ -378,7 +379,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) {
@@ -508,7 +509,7 @@ 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)) {
@@ -693,18 +694,19 @@ 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
 U_BOOT_CMD(
        usb,    5,      1,      do_usb,
        "USB sub-system",
-       "reset - reset (rescan) USB controller\n"
-       "usb stop [f]  - stop USB [f]=force stop\n"
-       "usb tree  - show USB device tree\n"
+       "start - start (scan) USB controller\n"
+       "usb reset - reset (rescan) USB controller\n"
+       "usb stop [f] - stop USB [f]=force stop\n"
+       "usb tree - show USB device tree\n"
        "usb info [dev] - show available USB devices\n"
-       "usb storage  - show details of USB storage devices\n"
+       "usb storage - show details of USB storage devices\n"
        "usb dev [dev] - show or set current USB storage device\n"
        "usb part [dev] - print partition table of one or all USB storage"
        " devices\n"
@@ -725,8 +727,9 @@ U_BOOT_CMD(
 U_BOOT_CMD(
        usb,    5,      1,      do_usb,
        "USB sub-system",
-       "reset - reset (rescan) USB controller\n"
-       "usb  tree  - show USB device tree\n"
-       "usb  info [dev] - show available USB devices"
+       "start - start (scan) USB controller\n"
+       "usb reset - reset (rescan) USB controller\n"
+       "usb tree - show USB device tree\n"
+       "usb info [dev] - show available USB devices"
 );
 #endif