TQM8xx: enable device tree support on all TQM8xx based boards.

[karo-tx-uboot.git] / 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 1c3b9c9..e5ed6eb
--- a/lib_m68k/bootm.c
+++ b/lib_m68k/bootm.c
@@ -24,7 +24,7 @@
 #include <common.h>
 #include <command.h>
 #include <image.h>
-#include <zlib.h>
+#include <u-boot/zlib.h>
 #include <bzlib.h>
 #include <watchdog.h>
 #include <environment.h>
@@ -42,32 +42,17 @@ DECLARE_GLOBAL_DATA_PTR;
 
 static ulong get_sp (void);
 static void set_clocks_in_mhz (bd_t *kbd);
-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)
+void arch_lmb_reserve(struct lmb *lmb)
 {
        ulong sp;
 
-       ulong rd_len;
-       ulong initrd_start, initrd_end;
-       int ret;
-
-       ulong cmd_start, cmd_end;
-       ulong bootmap_base;
-       bd_t  *kbd;
-       void  (*kernel) (bd_t *, ulong, ulong, ulong, ulong);
-       struct lmb *lmb = &images->lmb;
-
-       bootmap_base = getenv_bootm_low();
-
        /*
         * Booting a (Linux) kernel image
         *
         * Allocate space for command line and board info - the
         * address should be as high as possible within the reach of
-        * the kernel (see CFG_BOOTMAPSZ settings), but in unused
+        * the kernel (see CONFIG_SYS_BOOTMAPSZ settings), but in unused
         * memory, which means far enough below the current stack
         * pointer.
         */
@@ -76,7 +61,25 @@ void do_bootm_linux(cmd_tbl_t * cmdtp, int flag,
 
        /* adjust sp by 1K to be safe */
        sp -= 1024;
-       lmb_reserve(lmb, sp, (CFG_SDRAM_BASE + gd->ram_size - sp));
+       lmb_reserve(lmb, sp, (CONFIG_SYS_SDRAM_BASE + gd->ram_size - sp));
+}
+
+int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
+{
+       ulong rd_len;
+       ulong initrd_start, initrd_end;
+       int ret;
+
+       ulong cmd_start, cmd_end;
+       ulong bootmap_base;
+       bd_t  *kbd;
+       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 */
        ret = boot_get_cmdline (lmb, &cmd_start, &cmd_end, bootmap_base);
@@ -108,19 +111,17 @@ void do_bootm_linux(cmd_tbl_t * cmdtp, int flag,
 
        /*
         * 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 */
-       return ;
-
 error:
-       do_reset (cmdtp, flag, argc, argv);
-       return ;
+       return 1;
 }
 
 static ulong get_sp (void)