]> git.sur5r.net Git - u-boot/blobdiff - lib_ppc/bootm.c
Move CONFIG_UPDATE_TFTP code after CONFIG_PREBOOT
[u-boot] / lib_ppc / bootm.c
index d73d2fda795f4454fd029983a16e826e79ba6bc7..0685a9331cba9fa7918b309b8c004709308c4436 100644 (file)
  * MA 02111-1307 USA
  */
 
-#define DEBUG
 
 #include <common.h>
 #include <watchdog.h>
 #include <command.h>
 #include <image.h>
 #include <malloc.h>
-#include <zlib.h>
+#include <u-boot/zlib.h>
 #include <bzlib.h>
 #include <environment.h>
 #include <asm/byteorder.h>
 #include <libfdt.h>
 #include <fdt_support.h>
 
-static void fdt_error (const char *msg);
 #endif
 
-#ifdef CFG_INIT_RAM_LOCK
+#ifdef CONFIG_SYS_INIT_RAM_LOCK
 #include <asm/cache.h>
 #endif
 
 DECLARE_GLOBAL_DATA_PTR;
 
 extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
+extern ulong get_effective_memsize(void);
 static ulong get_sp (void);
+static void set_clocks_in_mhz (bd_t *kbd);
 
-#if defined(CONFIG_CMD_BDI)
-extern int do_bdinfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
+#ifndef CONFIG_SYS_LINUX_LOWMEM_MAX_SIZE
+#define CONFIG_SYS_LINUX_LOWMEM_MAX_SIZE       (768*1024*1024)
 #endif
 
-void  __attribute__((noinline))
-do_bootm_linux(cmd_tbl_t *cmdtp, int flag,
-               int     argc, char *argv[],
-               image_header_t *hdr,
-               int     verify)
+static void boot_jump_linux(bootm_headers_t *images)
 {
-       ulong   initrd_start, initrd_end;
-       ulong   rd_data_start, rd_data_end, rd_len;
+       void    (*kernel)(bd_t *, ulong r4, ulong r5, ulong r6,
+                         ulong r7, ulong r8, ulong r9);
+#ifdef CONFIG_OF_LIBFDT
+       char *of_flat_tree = images->ft_addr;
+#endif
 
-       ulong   cmd_start, cmd_end;
-       char    *cmdline;
+       kernel = (void (*)(bd_t *, ulong, ulong, ulong,
+                          ulong, ulong, ulong))images->ep;
+       debug ("## Transferring control to Linux (at address %08lx) ...\n",
+               (ulong)kernel);
 
-       ulong   sp_limit;
-       char    *s;
-       bd_t    *kbd;
-       void    (*kernel)(bd_t *, ulong, ulong, ulong, ulong);
+       show_boot_progress (15);
+
+#if defined(CONFIG_SYS_INIT_RAM_LOCK) && !defined(CONFIG_E500)
+       unlock_ram_in_cache();
+#endif
 
 #if defined(CONFIG_OF_LIBFDT)
-       image_header_t *fdt_hdr;
-       char    *of_flat_tree = NULL;
-       ulong   of_data = 0;
+       if (of_flat_tree) {     /* device tree; boot new style */
+               /*
+                * Linux Kernel Parameters (passing device tree):
+                *   r3: pointer to the fdt
+                *   r4: 0
+                *   r5: 0
+                *   r6: epapr magic
+                *   r7: size of IMA in bytes
+                *   r8: 0
+                *   r9: 0
+                */
+#if defined(CONFIG_85xx) || defined(CONFIG_440)
+ #define EPAPR_MAGIC   (0x45504150)
+#else
+ #define EPAPR_MAGIC   (0x65504150)
+#endif
+
+               debug ("   Booting using OF flat tree...\n");
+               WATCHDOG_RESET ();
+               (*kernel) ((bd_t *)of_flat_tree, 0, 0, EPAPR_MAGIC,
+                          CONFIG_SYS_BOOTMAPSZ, 0, 0);
+               /* does not return */
+       } else
+#endif
+       {
+               /*
+                * 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
+                *   r8: 0
+                *   r9: 0
+                */
+               ulong cmd_start = images->cmdline_start;
+               ulong cmd_end = images->cmdline_end;
+               ulong initrd_start = images->initrd_start;
+               ulong initrd_end = images->initrd_end;
+               bd_t *kbd = images->kbd;
+
+               debug ("   Booting using board info...\n");
+               WATCHDOG_RESET ();
+               (*kernel) (kbd, initrd_start, initrd_end,
+                          cmd_start, cmd_end, 0, 0);
+               /* does not return */
+       }
+       return ;
+}
+
+void arch_lmb_reserve(struct lmb *lmb)
+{
+       phys_size_t bootm_size;
+       ulong size, sp, bootmap_base;
+
+       bootmap_base = getenv_bootm_low();
+       bootm_size = getenv_bootm_size();
+
+#ifdef DEBUG
+       if (((u64)bootmap_base + bootm_size) >
+           (CONFIG_SYS_SDRAM_BASE + (u64)gd->ram_size))
+               puts("WARNING: bootm_low + bootm_size exceed total memory\n");
+       if ((bootmap_base + bootm_size) > get_effective_memsize())
+               puts("WARNING: bootm_low + bootm_size exceed eff. memory\n");
 #endif
 
+       size = min(bootm_size, get_effective_memsize());
+       size = min(size, CONFIG_SYS_LINUX_LOWMEM_MAX_SIZE);
+
+       if (size < bootm_size) {
+               ulong base = bootmap_base + size;
+               printf("WARNING: adjusting available memory to %lx\n", size);
+               lmb_reserve(lmb, base, bootm_size - size);
+       }
+
        /*
         * 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 = get_sp();
+       debug ("## Current stack ends at 0x%08lx\n", sp);
 
-       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;
-
-       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);
-
-       cmd_start    = (ulong)&cmdline[0];
-       cmd_end      = cmd_start + strlen(cmdline);
+       /* adjust sp by 1K to be safe */
+       sp -= 1024;
+       lmb_reserve(lmb, sp, (CONFIG_SYS_SDRAM_BASE + get_effective_memsize() - sp));
 
-       *kbd = *(gd->bd);
-
-#ifdef DEBUG
-       printf ("## cmdline at 0x%08lX ... 0x%08lX\n", cmd_start, cmd_end);
+       return ;
+}
 
-#if defined(CONFIG_CMD_BDI)
-       do_bdinfo (NULL, 0, 0, NULL);
-#endif
+static void boot_prep_linux(void)
+{
+#ifdef CONFIG_MP
+       /* if we are MP make sure to flush the dcache() to any changes are made
+        * visibile to all other cores */
+       flush_dcache();
 #endif
+       return ;
+}
 
-       if ((s = getenv ("clocks_in_mhz")) != NULL) {
-               /* convert all clock information to MHz */
-               kbd->bi_intfreq /= 1000000L;
-               kbd->bi_busfreq /= 1000000L;
-#if defined(CONFIG_MPC8220)
-       kbd->bi_inpfreq /= 1000000L;
-       kbd->bi_pcifreq /= 1000000L;
-       kbd->bi_pevfreq /= 1000000L;
-       kbd->bi_flbfreq /= 1000000L;
-       kbd->bi_vcofreq /= 1000000L;
-#endif
-#if defined(CONFIG_CPM2)
-               kbd->bi_cpmfreq /= 1000000L;
-               kbd->bi_brgfreq /= 1000000L;
-               kbd->bi_sccfreq /= 1000000L;
-               kbd->bi_vco     /= 1000000L;
-#endif
-#if defined(CONFIG_MPC5xxx)
-               kbd->bi_ipbfreq /= 1000000L;
-               kbd->bi_pcifreq /= 1000000L;
-#endif /* CONFIG_MPC5xxx */
+static int boot_cmdline_linux(bootm_headers_t *images)
+{
+       ulong bootmap_base = getenv_bootm_low();
+       ulong of_size = images->ft_len;
+       struct lmb *lmb = &images->lmb;
+       ulong *cmd_start = &images->cmdline_start;
+       ulong *cmd_end = &images->cmdline_end;
+
+       int ret = 0;
+
+       if (!of_size) {
+               /* 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");
+                       return ret;
+               }
        }
 
-       /* find kernel */
-       kernel = (void (*)(bd_t *, ulong, ulong, ulong, ulong))image_get_ep (hdr);
-
-       /* find ramdisk */
-       get_ramdisk (cmdtp, flag, argc, argv, hdr, verify,
-                       IH_ARCH_PPC, &rd_data_start, &rd_data_end);
+       return ret;
+}
 
-       rd_len = rd_data_end - rd_data_start;
+static int boot_bd_t_linux(bootm_headers_t *images)
+{
+       ulong bootmap_base = getenv_bootm_low();
+       ulong of_size = images->ft_len;
+       struct lmb *lmb = &images->lmb;
+       bd_t **kbd = &images->kbd;
+
+       int ret = 0;
+
+       if (!of_size) {
+               /* 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");
+                       return ret;
+               }
+               set_clocks_in_mhz(*kbd);
+       }
 
-       ramdisk_high (rd_data_start, rd_len, kbd, sp_limit, get_sp (),
-                       &initrd_start, &initrd_end);
+       return ret;
+}
 
+static int boot_body_linux(bootm_headers_t *images)
+{
+       ulong rd_len;
+       struct lmb *lmb = &images->lmb;
+       ulong *initrd_start = &images->initrd_start;
+       ulong *initrd_end = &images->initrd_end;
 #if defined(CONFIG_OF_LIBFDT)
-       /* find flattened device tree */
-       if(argc > 3) {
-               of_flat_tree = (char *) simple_strtoul(argv[3], NULL, 16);
-               fdt_hdr = (image_header_t *)of_flat_tree;
-
-               if (fdt_check_header (of_flat_tree) == 0) {
-#ifndef CFG_NO_FLASH
-                       if (addr2info((ulong)of_flat_tree) != NULL)
-                               of_data = (ulong)of_flat_tree;
+       ulong bootmap_base = getenv_bootm_low();
+       ulong of_size = images->ft_len;
+       char **of_flat_tree = &images->ft_addr;
 #endif
-               } else if (image_check_magic (fdt_hdr)) {
-                       ulong image_start, image_end;
-                       ulong load_start, load_end;
-
-                       printf ("## Flat Device Tree at %08lX\n", fdt_hdr);
-                       print_image_hdr (fdt_hdr);
-
-                       image_start = (ulong)fdt_hdr;
-                       image_end = image_get_image_end (fdt_hdr);
-
-                       load_start = image_get_load (fdt_hdr);
-                       load_end = load_start + image_get_data_size (fdt_hdr);
-
-                       if ((load_start < image_end) && (load_end > image_start)) {
-                               fdt_error ("fdt overwritten");
-                               do_reset (cmdtp, flag, argc, argv);
-                       }
-
-                       puts ("   Verifying Checksum ... ");
-                       if (!image_check_hcrc (fdt_hdr)) {
-                               fdt_error ("fdt header checksum invalid");
-                               do_reset (cmdtp, flag, argc, argv);
-                       }
-
-                       if (!image_check_dcrc (fdt_hdr)) {
-                               fdt_error ("fdt checksum invalid");
-                               do_reset (cmdtp, flag, argc, argv);
-                       }
-                       puts ("OK\n");
-
-                       if (!image_check_type (fdt_hdr, IH_TYPE_FLATDT)) {
-                               fdt_error ("uImage is not a fdt");
-                               do_reset (cmdtp, flag, argc, argv);
-                       }
-                       if (image_get_comp (fdt_hdr) != IH_COMP_NONE) {
-                               fdt_error ("uImage is compressed");
-                               do_reset (cmdtp, flag, argc, argv);
-                       }
-                       if (fdt_check_header (of_flat_tree + image_get_header_size ()) != 0) {
-                               fdt_error ("uImage data is not a fdt");
-                               do_reset (cmdtp, flag, argc, argv);
-                       }
-
-                       memmove ((void *)image_get_load (fdt_hdr),
-                               (void *)(of_flat_tree + image_get_header_size ()),
-                               image_get_data_size (fdt_hdr));
-
-                       of_flat_tree = (char *)image_get_load (fdt_hdr);
-               } else {
-                       fdt_error ("Did not find a Flattened Device Tree");
-                       do_reset (cmdtp, flag, argc, argv);
-               }
-               printf ("   Booting using the fdt at 0x%x\n",
-                               of_flat_tree);
-       } else if (image_check_type (hdr, IH_TYPE_MULTI)) {
-               ulong fdt_data, fdt_len;
 
-               image_multi_getimg (hdr, 2, &fdt_data, &fdt_len);
-               if (fdt_len) {
+       int ret;
 
-                       of_flat_tree = (char *)fdt_data;
+       /* allocate space and init command line */
+       ret = boot_cmdline_linux(images);
+       if (ret)
+               return ret;
 
-#ifndef CFG_NO_FLASH
-                       /* move the blob if it is in flash (set of_data to !null) */
-                       if (addr2info ((ulong)of_flat_tree) != NULL)
-                               of_data = (ulong)of_flat_tree;
-#endif
-
-                       if (fdt_check_header (of_flat_tree) != 0) {
-                               fdt_error ("image is not a fdt");
-                               do_reset (cmdtp, flag, argc, argv);
-                       }
-
-                       if (be32_to_cpu (fdt_totalsize (of_flat_tree)) != fdt_len) {
-                               fdt_error ("fdt size != image size");
-                               do_reset (cmdtp, flag, argc, argv);
-                       }
-               }
-       }
-#endif
+       /* allocate space for kernel copy of board info */
+       ret = boot_bd_t_linux(images);
+       if (ret)
+               return ret;
 
+       rd_len = images->rd_end - images->rd_start;
+       ret = boot_ramdisk_high (lmb, images->rd_start, rd_len, initrd_start, initrd_end);
+       if (ret)
+               return ret;
 
 #if defined(CONFIG_OF_LIBFDT)
+       ret = boot_relocate_fdt(lmb, bootmap_base, of_flat_tree, &of_size);
+       if (ret)
+               return ret;
 
-#ifdef CFG_BOOTMAPSZ
-       /*
-        * The blob must be within CFG_BOOTMAPSZ,
-        * so we flag it to be copied if it is not.
-        */
-       if (of_flat_tree >= (char *)CFG_BOOTMAPSZ)
-               of_data = (ulong)of_flat_tree;
-#endif
-
-       /* move of_flat_tree if needed */
-       if (of_data) {
-               int err;
-               ulong of_start, of_len;
-
-               of_len = be32_to_cpu(fdt_totalsize(of_data));
-
-               /* position on a 4K boundary before the kbd */
-               of_start  = (ulong)kbd - of_len;
-               of_start &= ~(4096 - 1);        /* align on page */
-               debug ("## device tree at 0x%08lX ... 0x%08lX (len=%ld=0x%lX)\n",
-                       of_data, of_data + of_len - 1, of_len, of_len);
-
-               of_flat_tree = (char *)of_start;
-               printf ("   Loading Device Tree to %08lx, end %08lx ... ",
-                       of_start, of_start + of_len - 1);
-               err = fdt_open_into((void *)of_data, (void *)of_start, of_len);
-               if (err != 0) {
-                       fdt_error ("fdt move failed");
-                       do_reset (cmdtp, flag, argc, argv);
-               }
-               puts ("OK\n");
-       }
        /*
         * Add the chosen node if it doesn't exist, add the env and bd_t
         * if the user wants it (the logic is in the subroutines).
         */
-       if (of_flat_tree) {
-               if (fdt_chosen(of_flat_tree, initrd_start, initrd_end, 0) < 0) {
-                       fdt_error ("/chosen node create failed");
-                       do_reset (cmdtp, flag, argc, argv);
-               }
-#ifdef CONFIG_OF_HAS_UBOOT_ENV
-               if (fdt_env(of_flat_tree) < 0) {
-                       fdt_error ("/u-boot-env node create failed");
-                       do_reset (cmdtp, flag, argc, argv);
+       if (of_size) {
+               if (fdt_chosen(*of_flat_tree, 1) < 0) {
+                       puts ("ERROR: ");
+                       puts ("/chosen node create failed");
+                       puts (" - must RESET the board to recover.\n");
+                       return -1;
                }
-#endif
-#ifdef CONFIG_OF_HAS_BD_T
-               if (fdt_bd_t(of_flat_tree) < 0) {
-                       fdt_error ("/bd_t node create failed");
-                       do_reset (cmdtp, flag, argc, argv);
-               }
-#endif
 #ifdef CONFIG_OF_BOARD_SETUP
                /* Call the board-specific fixup routine */
-               ft_board_setup(of_flat_tree, gd->bd);
+               ft_board_setup(*of_flat_tree, gd->bd);
 #endif
+
+               /* Delete the old LMB reservation */
+               lmb_free(lmb, (phys_addr_t)(u32)*of_flat_tree,
+                               (phys_size_t)fdt_totalsize(*of_flat_tree));
+
+               ret = fdt_resize(*of_flat_tree);
+               if (ret < 0)
+                       return ret;
+               of_size = ret;
+
+               if (*initrd_start && *initrd_end)
+                       of_size += FDT_RAMDISK_OVERHEAD;
+               /* Create a new LMB reservation */
+               lmb_reserve(lmb, (ulong)*of_flat_tree, of_size);
+
+               /* fixup the initrd now that we know where it should be */
+               if (*initrd_start && *initrd_end)
+                       fdt_initrd(*of_flat_tree, *initrd_start, *initrd_end, 1);
        }
 #endif /* CONFIG_OF_LIBFDT */
+       return 0;
+}
 
-       debug ("## Transferring control to Linux (at address %08lx) ...\n",
-               (ulong)kernel);
+__attribute__((noinline))
+int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
+{
+       int     ret;
 
-       show_boot_progress (15);
+       if (flag & BOOTM_STATE_OS_CMDLINE) {
+               boot_cmdline_linux(images);
+               return 0;
+       }
 
-#if defined(CFG_INIT_RAM_LOCK) && !defined(CONFIG_E500)
-       unlock_ram_in_cache();
-#endif
+       if (flag & BOOTM_STATE_OS_BD_T) {
+               boot_bd_t_linux(images);
+               return 0;
+       }
 
-#if defined(CONFIG_OF_LIBFDT)
-       if (of_flat_tree) {     /* device tree; boot new style */
-               /*
-                * Linux Kernel Parameters (passing device tree):
-                *   r3: pointer to the fdt, followed by the board info data
-                *   r4: physical pointer to the kernel itself
-                *   r5: NULL
-                *   r6: NULL
-                *   r7: NULL
-                */
-               (*kernel) ((bd_t *)of_flat_tree, (ulong)kernel, 0, 0, 0);
-               /* does not return */
+       if (flag & BOOTM_STATE_OS_PREP) {
+               boot_prep_linux();
+               return 0;
        }
-#endif
-       /*
-        * 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
-        */
-       (*kernel) (kbd, initrd_start, initrd_end, cmd_start, cmd_end);
-       /* does not return */
+
+       if (flag & BOOTM_STATE_OS_GO) {
+               boot_jump_linux(images);
+               return 0;
+       }
+
+       boot_prep_linux();
+       ret = boot_body_linux(images);
+       if (ret)
+               return ret;
+       boot_jump_linux(images);
+
+       return 0;
 }
 
 static ulong get_sp (void)
@@ -353,11 +338,30 @@ static ulong get_sp (void)
        return sp;
 }
 
-#if defined(CONFIG_OF_LIBFDT)
-static void fdt_error (const char *msg)
+static void set_clocks_in_mhz (bd_t *kbd)
 {
-       puts ("ERROR: ");
-       puts (msg);
-       puts (" - must RESET the board to recover.\n");
-}
+       char    *s;
+
+       if ((s = getenv ("clocks_in_mhz")) != NULL) {
+               /* convert all clock information to MHz */
+               kbd->bi_intfreq /= 1000000L;
+               kbd->bi_busfreq /= 1000000L;
+#if defined(CONFIG_MPC8220)
+               kbd->bi_inpfreq /= 1000000L;
+               kbd->bi_pcifreq /= 1000000L;
+               kbd->bi_pevfreq /= 1000000L;
+               kbd->bi_flbfreq /= 1000000L;
+               kbd->bi_vcofreq /= 1000000L;
 #endif
+#if defined(CONFIG_CPM2)
+               kbd->bi_cpmfreq /= 1000000L;
+               kbd->bi_brgfreq /= 1000000L;
+               kbd->bi_sccfreq /= 1000000L;
+               kbd->bi_vco     /= 1000000L;
+#endif
+#if defined(CONFIG_MPC5xxx)
+               kbd->bi_ipbfreq /= 1000000L;
+               kbd->bi_pcifreq /= 1000000L;
+#endif /* CONFIG_MPC5xxx */
+       }
+}