MPC8610HPCD: Report board id, board version and fpga version.

[u-boot] / lib_mips / bootm.c

diff --git a/lib_mips/bootm.c b/lib_mips/bootm.c
index fb91c76d94b0885f3d1e2c6e88611e3b1727fcc9..f813fc583100a9a15a3e1dc6fe1cea21a8d8ef2d 100644 (file)
--- a/lib_mips/bootm.c
+++ b/lib_mips/bootm.c
@@ -43,21 +43,40 @@ static int  linux_env_idx;
 static void linux_params_init (ulong start, char * commandline);
 static void linux_env_set (char * env_name, char * env_val);
 
+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)
 {
-       ulong initrd_start, initrd_end;
-
-       void (*theKernel) (int, char **, char **, int *);
-       char *commandline = getenv ("bootargs");
-       char env_buf[12];
-
-       theKernel =
-               (void (*)(int, char **, char **, int *))image_get_ep (hdr);
+       ulong   initrd_start, initrd_end;
+       ulong   ep = 0;
+       void    (*theKernel) (int, char **, char **, int *);
+       char    *commandline = getenv ("bootargs");
+       char    env_buf[12];
+       int     ret;
+
+       /* find kernel entry point */
+       if (images->legacy_hdr_valid) {
+               ep = image_get_ep (&images->legacy_hdr_os_copy);
+#if defined(CONFIG_FIT)
+       } else if (images->fit_uname_os) {
+               ret = fit_image_get_entry (images->fit_hdr_os,
+                               images->fit_noffset_os, &ep);
+               if (ret) {
+                       puts ("Can't get entry point property!\n");
+                       goto error;
+               }
+#endif
+       } else {
+               puts ("Could not find kernel entry point!\n");
+               goto error;
+       }
+       theKernel = (void (*)(int, char **, char **, int *))ep;
 
-       get_ramdisk (cmdtp, flag, argc, argv, hdr, verify,
-                       IH_ARCH_MIPS, &initrd_start, &initrd_end);
+       ret = boot_get_ramdisk (argc, argv, images, IH_ARCH_MIPS,
+                       &initrd_start, &initrd_end);
+       if (ret)
+               goto error;
 
        show_boot_progress (15);
 
@@ -94,10 +113,20 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
        sprintf (env_buf, "0x%X", (uint) (gd->bd->bi_flashsize));
        linux_env_set ("flash_size", env_buf);
 
+       if (!images->autostart)
+               return ;
+
        /* we assume that the kernel is in place */
        printf ("\nStarting kernel ...\n\n");
 
        theKernel (linux_argc, linux_argv, linux_env, 0);
+       /* does not return */
+       return;
+
+error:
+       if (images->autostart)
+               do_reset (cmdtp, flag, argc, argv);
+       return;
 }
 
 static void linux_params_init (ulong start, char *line)