nand: fsl_upm: convert to updated MTD NAND infrastructure

[oweals/u-boot.git] / common / cmd_bootm.c

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 1c0a4161d0e820f933dd3658292d3eddeb5b951f..529596926001730d491e23eb35a8593e6d9d1e30 100644 (file)
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -36,7 +36,7 @@
 #include <lmb.h>
 #include <asm/byteorder.h>
 
-#if (CONFIG_COMMANDS & CFG_CMD_USB)
+#if defined(CONFIG_CMD_USB)
 #include <usb.h>
 #endif
 
@@ -138,7 +138,6 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
        memset ((void *)&images, 0, sizeof (images));
        images.verify = getenv_yesno ("verify");
-       images.autostart = getenv_yesno ("autostart");
        images.lmb = &lmb;
 
        lmb_init(&lmb);
@@ -217,7 +216,7 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
         */
        iflag = disable_interrupts();
 
-#if (CONFIG_COMMANDS & CFG_CMD_USB)
+#if defined(CONFIG_CMD_USB)
        /*
         * turn off USB to prevent the host controller from writing to the
         * SDRAM while Linux is booting. This could happen (at least for OHCI
@@ -251,10 +250,9 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
                        memmove_wd ((void *)load_start,
                                   (void *)os_data, os_len, CHUNKSZ);
-
-                       load_end = load_start + os_len;
-                       puts("OK\n");
                }
+               load_end = load_start + os_len;
+               puts("OK\n");
                break;
        case IH_COMP_GZIP:
                printf ("   Uncompressing %s ... ", type_name);
@@ -363,10 +361,9 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        show_boot_progress (-9);
 #ifdef DEBUG
        puts ("\n## Control returned to monitor - resetting...\n");
-       if (images.autostart)
-               do_reset (cmdtp, flag, argc, argv);
+       do_reset (cmdtp, flag, argc, argv);
 #endif
-       if (!images.autostart && iflag)
+       if (iflag)
                enable_interrupts();
 
        return 1;