kbuild: add CONFIG_ prefix to USE_PRIVATE_LIBGCC

[karo-tx-uboot.git] / arch / mips / lib / bootm.c

diff --git a/arch/mips/lib/bootm.c b/arch/mips/lib/bootm.c
index ba9fd687eccad302861b8168ca3777269e22442d..71bb0d2a199b28512828640352ec547b67cf6ff9 100644 (file)
--- a/arch/mips/lib/bootm.c
+++ b/arch/mips/lib/bootm.c
@@ -17,6 +17,12 @@ DECLARE_GLOBAL_DATA_PTR;
 #define        LINUX_MAX_ENVS          256
 #define        LINUX_MAX_ARGS          256
 
+#if defined(CONFIG_MALTA)
+#define mips_boot_malta                1
+#else
+#define mips_boot_malta                0
+#endif
+
 static int linux_argc;
 static char **linux_argv;
 static char *linux_argp;
@@ -25,9 +31,6 @@ static char **linux_env;
 static char *linux_env_p;
 static int linux_env_idx;
 
-static void linux_params_init(void);
-static void linux_env_set(char *env_name, char *env_val);
-
 static ulong arch_get_sp(void)
 {
        ulong ret;
@@ -120,12 +123,42 @@ static void boot_cmdline_linux(bootm_headers_t *images)
        linux_cmdline_dump();
 }
 
+static void linux_env_init(void)
+{
+       linux_env = (char **)(((ulong) linux_argp + 15) & ~15);
+       linux_env[0] = 0;
+       linux_env_p = (char *)(linux_env + LINUX_MAX_ENVS);
+       linux_env_idx = 0;
+}
+
+static void linux_env_set(const char *env_name, const char *env_val)
+{
+       if (linux_env_idx < LINUX_MAX_ENVS - 1) {
+               linux_env[linux_env_idx] = linux_env_p;
+
+               strcpy(linux_env_p, env_name);
+               linux_env_p += strlen(env_name);
+
+               if (mips_boot_malta) {
+                       linux_env_p++;
+                       linux_env[++linux_env_idx] = linux_env_p;
+               } else {
+                       *linux_env_p++ = '=';
+               }
+
+               strcpy(linux_env_p, env_val);
+               linux_env_p += strlen(env_val);
+
+               linux_env_p++;
+               linux_env[++linux_env_idx] = 0;
+       }
+}
+
 static void boot_prep_linux(bootm_headers_t *images)
 {
        char env_buf[12];
-       char *cp;
-
-       linux_params_init();
+       const char *cp;
+       ulong rd_start, rd_size;
 
 #ifdef CONFIG_MEMSIZE_IN_BYTES
        sprintf(env_buf, "%lu", (ulong)gd->ram_size);
@@ -136,12 +169,17 @@ static void boot_prep_linux(bootm_headers_t *images)
              (ulong)(gd->ram_size >> 20));
 #endif /* CONFIG_MEMSIZE_IN_BYTES */
 
+       rd_start = UNCACHED_SDRAM(images->initrd_start);
+       rd_size = images->initrd_end - images->initrd_start;
+
+       linux_env_init();
+
        linux_env_set("memsize", env_buf);
 
-       sprintf(env_buf, "0x%08X", (uint) UNCACHED_SDRAM(images->rd_start));
+       sprintf(env_buf, "0x%08lX", rd_start);
        linux_env_set("initrd_start", env_buf);
 
-       sprintf(env_buf, "0x%X", (uint) (images->rd_end - images->rd_start));
+       sprintf(env_buf, "0x%lX", rd_size);
        linux_env_set("initrd_size", env_buf);
 
        sprintf(env_buf, "0x%08X", (uint) (gd->bd->bi_flashstart));
@@ -157,21 +195,30 @@ static void boot_prep_linux(bootm_headers_t *images)
        cp = getenv("eth1addr");
        if (cp)
                linux_env_set("eth1addr", cp);
+
+       if (mips_boot_malta) {
+               sprintf(env_buf, "%un8r", gd->baudrate);
+               linux_env_set("modetty0", env_buf);
+       }
 }
 
 static void boot_jump_linux(bootm_headers_t *images)
 {
        typedef void __noreturn (*kernel_entry_t)(int, ulong, ulong, ulong);
        kernel_entry_t kernel = (kernel_entry_t) images->ep;
+       ulong linux_extra = 0;
 
        debug("## Transferring control to Linux (at address %p) ...\n", kernel);
 
        bootstage_mark(BOOTSTAGE_ID_RUN_OS);
 
+       if (mips_boot_malta)
+               linux_extra = gd->ram_size;
+
        /* we assume that the kernel is in place */
        printf("\nStarting kernel ...\n\n");
 
-       kernel(linux_argc, (ulong)linux_argv, (ulong)linux_env, 0);
+       kernel(linux_argc, (ulong)linux_argv, (ulong)linux_env, linux_extra);
 }
 
 int do_bootm_linux(int flag, int argc, char * const argv[],
@@ -203,30 +250,3 @@ int do_bootm_linux(int flag, int argc, char * const argv[],
        /* does not return */
        return 1;
 }
-
-static void linux_params_init(void)
-{
-       linux_env = (char **)(((ulong) linux_argp + 15) & ~15);
-       linux_env[0] = 0;
-       linux_env_p = (char *)(linux_env + LINUX_MAX_ENVS);
-       linux_env_idx = 0;
-}
-
-static void linux_env_set(char *env_name, char *env_val)
-{
-       if (linux_env_idx < LINUX_MAX_ENVS - 1) {
-               linux_env[linux_env_idx] = linux_env_p;
-
-               strcpy(linux_env_p, env_name);
-               linux_env_p += strlen(env_name);
-
-               strcpy(linux_env_p, "=");
-               linux_env_p += 1;
-
-               strcpy(linux_env_p, env_val);
-               linux_env_p += strlen(env_val);
-
-               linux_env_p++;
-               linux_env[++linux_env_idx] = 0;
-       }
-}