[new uImage] Respect autostart setting in linux bootm

[J-u-boot.git] / lib_i386 / bootm.c

diff --git a/lib_i386/bootm.c b/lib_i386/bootm.c
index 3a6497c77a24c950a82dc01686478aa346059ac2..89a423c24375591a283b04388c4ca5dc79d7e68e 100644 (file)
--- a/lib_i386/bootm.c
+++ b/lib_i386/bootm.c
@@ -32,7 +32,7 @@
 extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
 
 void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
-               bootm_headers_t *images, int verify)
+               bootm_headers_t *images)
 {
        void            *base_ptr;
        ulong           os_data, os_len;
@@ -40,7 +40,7 @@ void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
        ulong           ep;
        image_header_t  *hdr;
 
-       get_ramdisk (cmdtp, flag, argc, argv, images, verify,
+       get_ramdisk (cmdtp, flag, argc, argv, images,
                        IH_ARCH_I386, &initrd_start, &initrd_end);
 
        if (images->legacy_hdr_valid) {
@@ -72,6 +72,9 @@ void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
 
        }
 
+       if (!images->autostart)
+               return ;
+
 #ifdef DEBUG
        printf ("## Transferring control to Linux (at address %08x) ...\n",
                (u32)base_ptr);