Merge commit 'wd/master'

[platform/kernel/u-boot.git] / lib_sh / bootm.c

diff --git a/lib_sh/bootm.c b/lib_sh/bootm.c
index 55e64f5..dd32a3e 100644 (file)
--- a/lib_sh/bootm.c
+++ b/lib_sh/bootm.c
@@ -30,7 +30,7 @@
  * arch/sh/kernel/setup.c and may require tweaking if the kernel sources
  * change.
  */
-#define PARAM   ((unsigned char *)CFG_SDRAM_BASE + 0x1000)
+#define PARAM  ((unsigned char *)CFG_SDRAM_BASE + 0x1000)
 
 #define MOUNT_ROOT_RDONLY (*(unsigned long *) (PARAM+0x000))
 #define RAMDISK_FLAGS (*(unsigned long *) (PARAM+0x004))
@@ -41,7 +41,7 @@
 /* ... */
 #define COMMAND_LINE ((char *) (PARAM+0x100))
 
-#define RAMDISK_IMAGE_START_MASK        0x07FF
+#define RAMDISK_IMAGE_START_MASK       0x07FF
 
 extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
 
@@ -60,28 +60,42 @@ static void hexdump (unsigned char *buf, int len)
 #endif
 
 void do_bootm_linux (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
-                     bootm_headers_t *images, int verify)
+                    bootm_headers_t *images)
 {
        ulong   ep = 0;
        char    *bootargs = getenv("bootargs");
 
        /* find kernel entry point */
        if (images->legacy_hdr_valid) {
-               ep = image_get_ep (images->legacy_hdr_os);
+               ep = image_get_ep (&images->legacy_hdr_os_copy);
 #if defined(CONFIG_FIT)
        } else if (images->fit_uname_os) {
-               fit_unsupported_reset ("SH linux bootm");
-               do_reset (cmdtp, flag, argc, argv);
+               int 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");
-               do_reset (cmdtp, flag, argc, argv);
+               goto error;
        }
        void (*kernel) (void) = (void (*)(void))ep;
 
+       if (!images->autostart)
+               return ;
+
        /* Setup parameters */
        memset(PARAM, 0, 0x1000);       /* Clear zero page */
        strcpy(COMMAND_LINE, bootargs);
 
        kernel();
+       /* does not return */
+       return;
+
+error:
+       if (images->autostart)
+               do_reset (cmdtp, flag, argc, argv);
+       return;
 }