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 ab6c2a967616c8d210be87a7ebdcd671508e163d..107ebaaa67fe7262342cfbea61ff541a40931765 100644 (file)
--- a/lib_i386/bootm.c
+++ b/lib_i386/bootm.c
@@ -32,22 +32,48 @@
 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[],
-               image_header_t *hdr, int verify)
+               bootm_headers_t *images)
 {
-       void *base_ptr;
-
-       ulong os_data, os_len;
-       ulong initrd_start, initrd_end;
+       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, hdr, 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 multi-part image, we need to advance base ptr */
-       if (image_check_type (hdr, IH_TYPE_MULTI)) {
-               image_multi_getimg (hdr, 0, &os_data, &os_len);
+       if (images->legacy_hdr_valid) {
+               hdr = images->legacy_hdr_os;
+               if (image_check_type (hdr, IH_TYPE_MULTI)) {
+                       /* if multi-part image, we need to get first subimage */
+                       image_multi_getimg (hdr, 0, &os_data, &os_len);
+               } else {
+                       /* otherwise get image data */
+                       os_data = image_get_data (hdr);
+                       os_len = image_get_data_size (hdr);
+               }
+#if defined(CONFIG_FIT)
+       } else if (images->fit_uname_os) {
+               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 {
-               os_data = image_get_data (hdr);
-               os_len = image_get_data_size (hdr);
+               puts ("Could not find kernel image!\n");
+               goto error;
        }
 
        base_ptr = load_zimage ((void*)os_data, os_len,
@@ -55,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);
@@ -68,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;
 }