omap3: remove typedefs for configuration structs

[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 3fd38e9..e5ed6eb
--- a/lib_m68k/bootm.c
+++ b/lib_m68k/bootm.c
@@ -24,11 +24,14 @@
 #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>
 #include <asm/byteorder.h>
+#ifdef CONFIG_SHOW_BOOT_PROGRESS
+# include <status_led.h>
+#endif
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -37,102 +40,88 @@ DECLARE_GLOBAL_DATA_PTR;
 #define LINUX_MAX_ENVS         256
 #define LINUX_MAX_ARGS         256
 
-#ifdef CONFIG_SHOW_BOOT_PROGRESS
-# include <status_led.h>
-# define SHOW_BOOT_PROGRESS(arg)       show_boot_progress(arg)
-#else
-# define SHOW_BOOT_PROGRESS(arg)
-#endif
-
 static ulong get_sp (void);
+static void set_clocks_in_mhz (bd_t *kbd);
 
-void do_bootm_linux(cmd_tbl_t * cmdtp, int flag,
-                   int argc, char *argv[],
-                   image_header_t *hdr, int verify)
+void arch_lmb_reserve(struct lmb *lmb)
 {
-       ulong sp_limit;
-
-       ulong rd_data_start, rd_data_end, rd_len;
-       ulong initrd_start, initrd_end;
-
-       ulong cmd_start, cmd_end;
-       char *cmdline;
-       char *s;
-       bd_t *kbd;
-       void (*kernel) (bd_t *, ulong, ulong, ulong, ulong);
+       ulong sp;
 
        /*
         * 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.
         */
-       sp_limit = get_sp();
-
-       debug("## Current stack ends at 0x%08lX ", sp_limit);
-
-       sp_limit -= 2048;               /* just to be sure */
-       if (sp_limit > CFG_BOOTMAPSZ)
-               sp_limit = CFG_BOOTMAPSZ;
-       sp_limit &= ~0xF;
+       sp = get_sp();
+       debug ("## Current stack ends at 0x%08lx ", sp);
 
-       debug("=> set upper limit to 0x%08lX\n", sp_limit);
-
-       cmdline = (char *)((sp_limit - CFG_BARGSIZE) & ~0xF);
-       kbd = (bd_t *) (((ulong) cmdline - sizeof(bd_t)) & ~0xF);
-
-       if ((s = getenv("bootargs")) == NULL)
-               s = "";
-
-       strcpy(cmdline, s);
+       /* adjust sp by 1K to be safe */
+       sp -= 1024;
+       lmb_reserve(lmb, sp, (CONFIG_SYS_SDRAM_BASE + gd->ram_size - sp));
+}
 
-       cmd_start = (ulong) & cmdline[0];
-       cmd_end = cmd_start + strlen(cmdline);
+int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
+{
+       ulong rd_len;
+       ulong initrd_start, initrd_end;
+       int ret;
 
-       *kbd = *(gd->bd);
+       ulong cmd_start, cmd_end;
+       ulong bootmap_base;
+       bd_t  *kbd;
+       void  (*kernel) (bd_t *, ulong, ulong, ulong, ulong);
+       struct lmb *lmb = &images->lmb;
 
-#ifdef DEBUG
-       printf("## cmdline at 0x%08lX ... 0x%08lX\n", cmd_start, cmd_end);
+       if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
+               return 1;
 
-       do_bdinfo(NULL, 0, 0, NULL);
-#endif
+       bootmap_base = getenv_bootm_low();
 
-       if ((s = getenv("clocks_in_mhz")) != NULL) {
-               /* convert all clock information to MHz */
-               kbd->bi_intfreq /= 1000000L;
-               kbd->bi_busfreq /= 1000000L;
+       /* allocate space and init command line */
+       ret = boot_get_cmdline (lmb, &cmd_start, &cmd_end, bootmap_base);
+       if (ret) {
+               puts("ERROR with allocation of cmdline\n");
+               goto error;
        }
 
-       /* find kernel */
-       kernel =
-           (void (*)(bd_t *, ulong, ulong, ulong, ulong))image_get_ep (hdr);
+       /* allocate space for kernel copy of board info */
+       ret = boot_get_kbd (lmb, &kbd, bootmap_base);
+       if (ret) {
+               puts("ERROR with allocation of kernel bd\n");
+               goto error;
+       }
+       set_clocks_in_mhz(kbd);
 
-       /* find ramdisk */
-       get_ramdisk (cmdtp, flag, argc, argv, hdr, verify,
-                       IH_ARCH_M68K, &rd_data_start, &rd_data_end);
+       kernel = (void (*)(bd_t *, ulong, ulong, ulong, ulong))images->ep;
 
-       rd_len = rd_data_end - rd_data_start;
-       ramdisk_high (rd_data_start, rd_len, kdb, sp_limit, get_sp (),
+       rd_len = images->rd_end - images->rd_start;
+       ret = boot_ramdisk_high (lmb, images->rd_start, rd_len,
                        &initrd_start, &initrd_end);
+       if (ret)
+               goto error;
 
        debug("## Transferring control to Linux (at address %08lx) ...\n",
              (ulong) kernel);
 
-       SHOW_BOOT_PROGRESS(15);
+       show_boot_progress (15);
 
        /*
         * 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 */
+error:
+       return 1;
 }
 
 static ulong get_sp (void)
@@ -144,3 +133,14 @@ static ulong get_sp (void)
 
        return sp;
 }
+
+static void set_clocks_in_mhz (bd_t *kbd)
+{
+       char *s;
+
+       if ((s = getenv("clocks_in_mhz")) != NULL) {
+               /* convert all clock information to MHz */
+               kbd->bi_intfreq /= 1000000L;
+               kbd->bi_busfreq /= 1000000L;
+       }
+}