ppc4xx: Add 405EX(r) revision C PVR definitions and detection code

[u-boot] / lib_i386 / bootm.c

diff --git a/lib_i386/bootm.c b/lib_i386/bootm.c
index 3a6497c77a24c950a82dc01686478aa346059ac2..107ebaaa67fe7262342cfbea61ff541a40931765 100644 (file)
--- a/lib_i386/bootm.c
+++ b/lib_i386/bootm.c
@@ -32,16 +32,23 @@
 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;
        ulong           initrd_start, initrd_end;
        ulong           ep;
        image_header_t  *hdr;
+       int             ret;
+#if defined(CONFIG_FIT)
+       const void      *data;
+       size_t          len;
+#endif
 
-       get_ramdisk (cmdtp, flag, argc, argv, images, verify,
-                       IH_ARCH_I386, &initrd_start, &initrd_end);
+       ret = boot_get_ramdisk (argc, argv, images, IH_ARCH_I386,
+                       &initrd_start, &initrd_end);
+       if (ret)
+               goto error;
 
        if (images->legacy_hdr_valid) {
                hdr = images->legacy_hdr_os;
@@ -55,12 +62,18 @@ void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
                }
 #if defined(CONFIG_FIT)
        } else if (images->fit_uname_os) {
-               fit_unsupported_reset ("I386 linux bootm");
-               do_reset (cmdtp, flag, argc, argv);
+               ret = fit_image_get_data (images->fit_hdr_os,
+                                       images->fit_noffset_os, &data, &len);
+               if (ret) {
+                       puts ("Can't get image data/size!\n");
+                       goto error;
+               }
+               os_data = (ulong)data;
+               os_len = (ulong)len;
 #endif
        } else {
                puts ("Could not find kernel image!\n");
-               do_reset (cmdtp, flag, argc, argv);
+               goto error;
        }
 
        base_ptr = load_zimage ((void*)os_data, os_len,
@@ -68,10 +81,13 @@ void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
 
        if (NULL == base_ptr) {
                printf ("## Kernel loading failed ...\n");
-               do_reset(cmdtp, flag, argc, argv);
+               goto error;
 
        }
 
+       if (!images->autostart)
+               return ;
+
 #ifdef DEBUG
        printf ("## Transferring control to Linux (at address %08x) ...\n",
                (u32)base_ptr);
@@ -81,5 +97,11 @@ void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
        printf("\nStarting kernel ...\n\n");
 
        boot_zimage(base_ptr);
+       /* does not return */
+       return;
 
+error:
+       if (images->autostart)
+               do_reset (cmdtp, flag, argc, argv);
+       return;
 }