Merge git://git.denx.de/u-boot-socfpga
[platform/kernel/u-boot.git] / arch / mips / lib / bootm.c
index e0722d2..2b67905 100644 (file)
@@ -7,19 +7,15 @@
 
 #include <common.h>
 #include <image.h>
+#include <fdt_support.h>
 #include <asm/addrspace.h>
+#include <asm/io.h>
 
 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;
@@ -46,21 +42,7 @@ void arch_lmb_reserve(struct lmb *lmb)
 
        /* adjust sp by 4K to be safe */
        sp -= 4096;
-       lmb_reserve(lmb, sp, CONFIG_SYS_SDRAM_BASE + gd->ram_size - sp);
-}
-
-static int boot_setup_linux(bootm_headers_t *images)
-{
-       int ret;
-       ulong rd_len;
-
-       rd_len = images->rd_end - images->rd_start;
-       ret = boot_ramdisk_high(&images->lmb, images->rd_start,
-               rd_len, &images->initrd_start, &images->initrd_end);
-       if (ret)
-               return ret;
-
-       return 0;
+       lmb_reserve(lmb, sp, gd->ram_top - sp);
 }
 
 static void linux_cmdline_init(void)
@@ -92,7 +74,7 @@ static void linux_cmdline_dump(void)
                debug("   arg %03d: %s\n", i, linux_argv[i]);
 }
 
-static void boot_cmdline_linux(bootm_headers_t *images)
+static void linux_cmdline_legacy(bootm_headers_t *images)
 {
        const char *bootargs, *next, *quote;
 
@@ -130,8 +112,28 @@ static void boot_cmdline_linux(bootm_headers_t *images)
 
                bootargs = next;
        }
+}
+
+static void linux_cmdline_append(bootm_headers_t *images)
+{
+       char buf[24];
+       ulong mem, rd_start, rd_size;
+
+       /* append mem */
+       mem = gd->ram_size >> 20;
+       sprintf(buf, "mem=%luM", mem);
+       linux_cmdline_set(buf, strlen(buf));
+
+       /* append rd_start and rd_size */
+       rd_start = images->initrd_start;
+       rd_size = images->initrd_end - images->initrd_start;
 
-       linux_cmdline_dump();
+       if (rd_size) {
+               sprintf(buf, "rd_start=0x%08lX", rd_start);
+               linux_cmdline_set(buf, strlen(buf));
+               sprintf(buf, "rd_size=0x%lX", rd_size);
+               linux_cmdline_set(buf, strlen(buf));
+       }
 }
 
 static void linux_env_init(void)
@@ -150,7 +152,7 @@ static void linux_env_set(const char *env_name, const char *env_val)
                strcpy(linux_env_p, env_name);
                linux_env_p += strlen(env_name);
 
-               if (mips_boot_malta) {
+               if (CONFIG_IS_ENABLED(MALTA)) {
                        linux_env_p++;
                        linux_env[++linux_env_idx] = linux_env_p;
                } else {
@@ -165,20 +167,21 @@ static void linux_env_set(const char *env_name, const char *env_val)
        }
 }
 
-static void boot_prep_linux(bootm_headers_t *images)
+static void linux_env_legacy(bootm_headers_t *images)
 {
        char env_buf[12];
        const char *cp;
        ulong rd_start, rd_size;
 
-#ifdef CONFIG_MEMSIZE_IN_BYTES
-       sprintf(env_buf, "%lu", (ulong)gd->ram_size);
-       debug("## Giving linux memsize in bytes, %lu\n", (ulong)gd->ram_size);
-#else
-       sprintf(env_buf, "%lu", (ulong)(gd->ram_size >> 20));
-       debug("## Giving linux memsize in MB, %lu\n",
-             (ulong)(gd->ram_size >> 20));
-#endif /* CONFIG_MEMSIZE_IN_BYTES */
+       if (CONFIG_IS_ENABLED(MEMSIZE_IN_BYTES)) {
+               sprintf(env_buf, "%lu", (ulong)gd->ram_size);
+               debug("## Giving linux memsize in bytes, %lu\n",
+                     (ulong)gd->ram_size);
+       } else {
+               sprintf(env_buf, "%lu", (ulong)(gd->ram_size >> 20));
+               debug("## Giving linux memsize in MB, %lu\n",
+                     (ulong)(gd->ram_size >> 20));
+       }
 
        rd_start = UNCACHED_SDRAM(images->initrd_start);
        rd_size = images->initrd_end - images->initrd_start;
@@ -207,12 +210,89 @@ static void boot_prep_linux(bootm_headers_t *images)
        if (cp)
                linux_env_set("eth1addr", cp);
 
-       if (mips_boot_malta) {
+       if (CONFIG_IS_ENABLED(MALTA)) {
                sprintf(env_buf, "%un8r", gd->baudrate);
                linux_env_set("modetty0", env_buf);
        }
 }
 
+static int boot_reloc_ramdisk(bootm_headers_t *images)
+{
+       ulong rd_len = images->rd_end - images->rd_start;
+
+       /*
+        * In case of legacy uImage's, relocation of ramdisk is already done
+        * by do_bootm_states() and should not repeated in 'bootm prep'.
+        */
+       if (images->state & BOOTM_STATE_RAMDISK) {
+               debug("## Ramdisk already relocated\n");
+               return 0;
+       }
+
+       return boot_ramdisk_high(&images->lmb, images->rd_start,
+               rd_len, &images->initrd_start, &images->initrd_end);
+}
+
+static int boot_reloc_fdt(bootm_headers_t *images)
+{
+       /*
+        * In case of legacy uImage's, relocation of FDT is already done
+        * by do_bootm_states() and should not repeated in 'bootm prep'.
+        */
+       if (images->state & BOOTM_STATE_FDT) {
+               debug("## FDT already relocated\n");
+               return 0;
+       }
+
+#if CONFIG_IS_ENABLED(MIPS_BOOT_FDT) && CONFIG_IS_ENABLED(OF_LIBFDT)
+       boot_fdt_add_mem_rsv_regions(&images->lmb, images->ft_addr);
+       return boot_relocate_fdt(&images->lmb, &images->ft_addr,
+               &images->ft_len);
+#else
+       return 0;
+#endif
+}
+
+int arch_fixup_fdt(void *blob)
+{
+#if CONFIG_IS_ENABLED(MIPS_BOOT_FDT) && CONFIG_IS_ENABLED(OF_LIBFDT)
+       u64 mem_start = virt_to_phys((void *)gd->bd->bi_memstart);
+       u64 mem_size = gd->ram_size;
+
+       return fdt_fixup_memory_banks(blob, &mem_start, &mem_size, 1);
+#else
+       return 0;
+#endif
+}
+
+static int boot_setup_fdt(bootm_headers_t *images)
+{
+       return image_setup_libfdt(images, images->ft_addr, images->ft_len,
+               &images->lmb);
+}
+
+static void boot_prep_linux(bootm_headers_t *images)
+{
+       boot_reloc_ramdisk(images);
+
+       if (CONFIG_IS_ENABLED(MIPS_BOOT_FDT) && images->ft_len) {
+               boot_reloc_fdt(images);
+               boot_setup_fdt(images);
+       } else {
+               if (CONFIG_IS_ENABLED(MIPS_BOOT_CMDLINE_LEGACY)) {
+                       linux_cmdline_legacy(images);
+
+                       if (!CONFIG_IS_ENABLED(MIPS_BOOT_ENV_LEGACY))
+                               linux_cmdline_append(images);
+
+                       linux_cmdline_dump();
+               }
+
+               if (CONFIG_IS_ENABLED(MIPS_BOOT_ENV_LEGACY))
+                       linux_env_legacy(images);
+       }
+}
+
 static void boot_jump_linux(bootm_headers_t *images)
 {
        typedef void __noreturn (*kernel_entry_t)(int, ulong, ulong, ulong);
@@ -223,47 +303,48 @@ static void boot_jump_linux(bootm_headers_t *images)
 
        bootstage_mark(BOOTSTAGE_ID_RUN_OS);
 
-       if (mips_boot_malta)
+       if (CONFIG_IS_ENABLED(MALTA))
                linux_extra = gd->ram_size;
 
-       /* we assume that the kernel is in place */
-       printf("\nStarting kernel ...\n\n");
+#if CONFIG_IS_ENABLED(BOOTSTAGE_FDT)
+       bootstage_fdt_add_report();
+#endif
+#if CONFIG_IS_ENABLED(BOOTSTAGE_REPORT)
+       bootstage_report();
+#endif
 
-       kernel(linux_argc, (ulong)linux_argv, (ulong)linux_env, linux_extra);
+       if (images->ft_len)
+               kernel(-2, (ulong)images->ft_addr, 0, 0);
+       else
+               kernel(linux_argc, (ulong)linux_argv, (ulong)linux_env,
+                       linux_extra);
 }
 
 int do_bootm_linux(int flag, int argc, char * const argv[],
                        bootm_headers_t *images)
 {
-       int ret;
-
        /* No need for those on MIPS */
        if (flag & BOOTM_STATE_OS_BD_T)
                return -1;
 
-       if (flag & BOOTM_STATE_OS_CMDLINE) {
-               boot_cmdline_linux(images);
+       /*
+        * Cmdline init has been moved to 'bootm prep' because it has to be
+        * done after relocation of ramdisk to always pass correct values
+        * for rd_start and rd_size to Linux kernel.
+        */
+       if (flag & BOOTM_STATE_OS_CMDLINE)
                return 0;
-       }
 
        if (flag & BOOTM_STATE_OS_PREP) {
                boot_prep_linux(images);
                return 0;
        }
 
-       if (flag & BOOTM_STATE_OS_GO) {
+       if (flag & (BOOTM_STATE_OS_GO | BOOTM_STATE_OS_FAKE_GO)) {
                boot_jump_linux(images);
                return 0;
        }
 
-       ret = boot_setup_linux(images);
-       if (ret)
-               return ret;
-
-       boot_cmdline_linux(images);
-       boot_prep_linux(images);
-       boot_jump_linux(images);
-
        /* does not return */
        return 1;
 }