gpio: Add PCA9698 40-bit I2C I/O port

[u-boot] / common / cmd_usb.c

diff --git a/common/cmd_usb.c b/common/cmd_usb.c
index 3ba6fff4fd325f7e83605a4d0313fa803ad27133..8c87265668d73715bc1a8f872cc2af8514ac2111 100644 (file)
--- a/common/cmd_usb.c
+++ b/common/cmd_usb.c
@@ -281,7 +281,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 +300,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 +355,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 +489,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 */