mmc: Change board_mmc_getcd() function prototype.

[karo-tx-uboot.git] / common / cmd_usb.c

diff --git a/common/cmd_usb.c b/common/cmd_usb.c
index b5731a7bb8d2235df31e607f74ac514df1bcd71b..320667f5fbcd873896d27ad73339715463b13dd1 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");
@@ -281,7 +282,7 @@ static inline char *portspeed(int speed)
 void usb_show_tree_graph(struct usb_device *dev, char *pre)
 {
        int i, index;
-       int has_child, last_child, port;
+       int has_child, last_child;
 
        index = strlen(pre);
        printf(" %s", pre);
@@ -300,7 +301,6 @@ void usb_show_tree_graph(struct usb_device *dev, char *pre)
                                /* found our pointer, see if we have a
                                 * little sister
                                 */
-                               port = i;
                                while (i++ < dev->parent->maxchild) {
                                        if (dev->parent->children[i] != NULL) {
                                                /* found a sister */
@@ -356,7 +356,7 @@ int do_usbboot(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        char *boot_device = NULL;
        char *ep;
-       int dev, part = 1, rcode;
+       int dev, part = 1;
        ulong addr, cnt;
        disk_partition_t info;
        image_header_t *hdr;
@@ -490,16 +490,7 @@ int do_usbboot(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
        flush_cache(addr, (cnt+1)*info.blksz);
 
-       /* Check if we should attempt an auto-start */
-       if (((ep = getenv("autostart")) != NULL) && (strcmp(ep, "yes") == 0)) {
-               char *local_args[2];
-               local_args[0] = argv[0];
-               local_args[1] = NULL;
-               printf("Automatic boot of image at addr 0x%08lX ...\n", addr);
-               rcode = do_bootm(cmdtp, 0, 1, local_args);
-               return rcode;
-       }
-       return 0;
+       return bootm_maybe_autostart(cmdtp, argv[0]);
 }
 #endif /* CONFIG_USB_STORAGE */
 
@@ -588,7 +579,7 @@ int do_usb(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                                        break;
                        }
                        if (dev == NULL) {
-                               printf("*** NO Device avaiable ***\n");
+                               printf("*** No device available ***\n");
                                return 0;
                        } else {
                                usb_display_desc(dev);
@@ -710,11 +701,12 @@ int do_usb(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 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"
@@ -735,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