sf: set common timeouts in seconds, not milliseconds

[u-boot] / lib_m68k / bootm.c

diff --git a/lib_m68k/bootm.c b/lib_m68k/bootm.c
old mode 100644 (file)
new mode 100755 (executable)
index c52dd2f..958c5ce
--- a/lib_m68k/bootm.c
+++ b/lib_m68k/bootm.c
@@ -76,6 +76,9 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
        void  (*kernel) (bd_t *, ulong, ulong, ulong, ulong);
        struct lmb *lmb = &images->lmb;
 
+       if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
+               return 1;
+
        bootmap_base = getenv_bootm_low();
 
        /* allocate space and init command line */
@@ -108,11 +111,12 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
 
        /*
         * Linux Kernel Parameters (passing board info data):
-        *   r3: ptr to board info data
-        *   r4: initrd_start or 0 if no initrd
-        *   r5: initrd_end - unused if r4 is 0
-        *   r6: Start of command line string
-        *   r7: End   of command line string
+        *   sp+00: Ignore, side effect of using jsr to jump to kernel
+        *   sp+04: ptr to board info data
+        *   sp+08: initrd_start or 0 if no initrd
+        *   sp+12: initrd_end - unused if initrd_start is 0
+        *   sp+16: Start of command line string
+        *   sp+20: End   of command line string
         */
        (*kernel) (kbd, initrd_start, initrd_end, cmd_start, cmd_end);
        /* does not return */