* MA 02111-1307 USA
*/
-#define DEBUG
#include <common.h>
#include <watchdog.h>
#include <libfdt.h>
#include <fdt_support.h>
-static void fdt_error (const char *msg);
-static int boot_get_fdt (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
- bootm_headers_t *images, char **of_flat_tree, ulong *of_size);
-static int boot_relocate_fdt (struct lmb *lmb, ulong bootmap_base,
- cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
- char **of_flat_tree, ulong *of_size);
#endif
#ifdef CFG_INIT_RAM_LOCK
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);
#define CFG_LINUX_LOWMEM_MAX_SIZE (768*1024*1024)
#endif
-void __attribute__((noinline))
-do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
- bootm_headers_t *images)
+__attribute__((noinline))
+int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
{
ulong sp;
ulong initrd_start, initrd_end;
- ulong rd_data_start, rd_data_end, rd_len;
+ ulong rd_len;
ulong size;
+ phys_size_t bootm_size;
ulong cmd_start, cmd_end, bootmap_base;
bd_t *kbd;
- ulong ep = 0;
- void (*kernel)(bd_t *, ulong, ulong, ulong, ulong);
+ void (*kernel)(bd_t *, ulong r4, ulong r5, ulong r6,
+ ulong r7, ulong r8, ulong r9);
int ret;
- ulong of_size = 0;
- struct lmb *lmb = images->lmb;
+ ulong of_size = images->ft_len;
+ struct lmb *lmb = &images->lmb;
#if defined(CONFIG_OF_LIBFDT)
- char *of_flat_tree = NULL;
+ char *of_flat_tree = images->ft_addr;
#endif
+ kernel = (void (*)(bd_t *, ulong, ulong, ulong,
+ ulong, ulong, ulong))images->ep;
+
bootmap_base = getenv_bootm_low();
- size = getenv_bootm_size();
+ bootm_size = getenv_bootm_size();
#ifdef DEBUG
- if (((u64)bootmap_base + size) > (CFG_SDRAM_BASE + (u64)gd->ram_size))
+ if (((u64)bootmap_base + bootm_size) >
+ (CFG_SDRAM_BASE + (u64)gd->ram_size))
puts("WARNING: bootm_low + bootm_size exceed total memory\n");
- if ((bootmap_base + size) > get_effective_memsize())
+ if ((bootmap_base + bootm_size) > get_effective_memsize())
puts("WARNING: bootm_low + bootm_size exceed eff. memory\n");
#endif
- size = min(size, get_effective_memsize());
+ size = min(bootm_size, get_effective_memsize());
size = min(size, CFG_LINUX_LOWMEM_MAX_SIZE);
- if (size < getenv_bootm_size()) {
+ if (size < bootm_size) {
ulong base = bootmap_base + size;
- printf("WARNING: adjusting available memory to %x\n", size);
- lmb_reserve(lmb, base, getenv_bootm_size() - size);
+ printf("WARNING: adjusting available memory to %lx\n", size);
+ lmb_reserve(lmb, base, bootm_size - size);
}
/*
sp -= 1024;
lmb_reserve(lmb, sp, (CFG_SDRAM_BASE + get_effective_memsize() - sp));
-#if defined(CONFIG_OF_LIBFDT)
- /* find flattened device tree */
- ret = boot_get_fdt (cmdtp, flag, argc, argv, images, &of_flat_tree, &of_size);
-
- if (ret)
- goto error;
-#endif
-
if (!of_size) {
/* allocate space and init command line */
ret = boot_get_cmdline (lmb, &cmd_start, &cmd_end, bootmap_base);
set_clocks_in_mhz(kbd);
}
- /* find kernel entry point */
- if (images->legacy_hdr_valid) {
- ep = image_get_ep (images->legacy_hdr_os);
-#if defined(CONFIG_FIT)
- } else if (images->fit_uname_os) {
- fit_unsupported_reset ("PPC linux bootm");
- goto error;
-#endif
- } else {
- puts ("Could not find kernel entry point!\n");
- goto error;
- }
- kernel = (void (*)(bd_t *, ulong, ulong, ulong, ulong))ep;
-
- /* find ramdisk */
- ret = boot_get_ramdisk (cmdtp, flag, argc, argv, images,
- IH_ARCH_PPC, &rd_data_start, &rd_data_end);
+ rd_len = images->rd_end - images->rd_start;
+#if defined(CONFIG_OF_LIBFDT)
+ ret = boot_relocate_fdt(lmb, bootmap_base, &of_flat_tree, &of_size);
if (ret)
goto error;
- rd_len = rd_data_end - rd_data_start;
-
-#if defined(CONFIG_OF_LIBFDT)
- ret = boot_relocate_fdt (lmb, bootmap_base,
- cmdtp, flag, argc, argv, &of_flat_tree, &of_size);
-
/*
* 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_size) {
/* pass in dummy initrd info, we'll fix up later */
- if (fdt_chosen(of_flat_tree, rd_data_start, rd_data_end, 0) < 0) {
- fdt_error ("/chosen node create failed");
+ if (fdt_chosen(of_flat_tree, images->rd_start, images->rd_end, 0) < 0) {
+ puts ("ERROR: ");
+ puts ("/chosen node create failed");
+ puts (" - must RESET the board to recover.\n");
goto error;
}
-#ifdef CONFIG_OF_HAS_UBOOT_ENV
- if (fdt_env(of_flat_tree) < 0) {
- fdt_error ("/u-boot-env node create failed");
- goto error;
- }
-#endif
-#ifdef CONFIG_OF_HAS_BD_T
- if (fdt_bd_t(of_flat_tree) < 0) {
- fdt_error ("/bd_t node create failed");
- goto error;
- }
-#endif
#ifdef CONFIG_OF_BOARD_SETUP
/* Call the board-specific fixup routine */
ft_board_setup(of_flat_tree, gd->bd);
#endif
}
+
+ /* Fixup the fdt memreserve now that we know how big it is */
+ if (of_flat_tree) {
+ /* 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)
+ goto error;
+ of_size = ret;
+
+ /* Create a new LMB reservation */
+ lmb_reserve(lmb, (ulong)of_flat_tree, of_size);
+ }
#endif /* CONFIG_OF_LIBFDT */
- ret = boot_ramdisk_high (lmb, rd_data_start, rd_len, &initrd_start, &initrd_end);
+ ret = boot_ramdisk_high (lmb, images->rd_start, rd_len, &initrd_start, &initrd_end);
if (ret)
goto error;
#if defined(CONFIG_OF_LIBFDT)
/* fixup the initrd now that we know where it should be */
- if ((of_flat_tree) && (initrd_start && initrd_end)) {
- uint64_t addr, size;
- int total = fdt_num_mem_rsv(of_flat_tree);
- int j;
-
- /* Look for the dummy entry and delete it */
- for (j = 0; j < total; j++) {
- fdt_get_mem_rsv(of_flat_tree, j, &addr, &size);
- if (addr == rd_data_start) {
- fdt_del_mem_rsv(of_flat_tree, j);
- break;
- }
- }
-
- ret = fdt_add_mem_rsv(of_flat_tree, initrd_start,
- initrd_end - initrd_start + 1);
- if (ret < 0) {
- printf("fdt_chosen: %s\n", fdt_strerror(ret));
- goto error;
- }
-
- do_fixup_by_path_u32(of_flat_tree, "/chosen",
- "linux,initrd-start", initrd_start, 0);
- do_fixup_by_path_u32(of_flat_tree, "/chosen",
- "linux,initrd-end", initrd_end, 0);
- }
+ if ((of_flat_tree) && (initrd_start && initrd_end))
+ fdt_initrd(of_flat_tree, initrd_start, initrd_end, 1);
#endif
debug ("## Transferring control to Linux (at address %08lx) ...\n",
(ulong)kernel);
#if defined(CFG_INIT_RAM_LOCK) && !defined(CONFIG_E500)
unlock_ram_in_cache();
#endif
- if (!images->autostart)
- return ;
#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
+ * r3: pointer to the fdt
+ * r4: 0
+ * r5: 0
+ * r6: epapr magic
+ * r7: size of IMA in bytes
+ * r8: 0
+ * r9: 0
*/
- (*kernel) ((bd_t *)of_flat_tree, (ulong)kernel, 0, 0, 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");
+ (*kernel) ((bd_t *)of_flat_tree, 0, 0, EPAPR_MAGIC,
+ CFG_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
- */
- (*kernel) (kbd, initrd_start, initrd_end, cmd_start, cmd_end);
- /* does not return */
- return ;
+ {
+ /*
+ * 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
+ */
+ debug (" Booting using board info...\n");
+ (*kernel) (kbd, initrd_start, initrd_end,
+ cmd_start, cmd_end, 0, 0);
+ /* does not return */
+ }
+ return 1;
error:
- if (images->autostart)
- do_reset (cmdtp, flag, argc, argv);
- return ;
+ return 1;
}
static ulong get_sp (void)
kbd->bi_cpmfreq /= 1000000L;
kbd->bi_brgfreq /= 1000000L;
kbd->bi_sccfreq /= 1000000L;
- kbd->bi_vco /= 1000000L;
+ kbd->bi_vco /= 1000000L;
#endif
#if defined(CONFIG_MPC5xxx)
kbd->bi_ipbfreq /= 1000000L;
#endif /* CONFIG_MPC5xxx */
}
}
-
-#if defined(CONFIG_OF_LIBFDT)
-static void fdt_error (const char *msg)
-{
- puts ("ERROR: ");
- puts (msg);
- puts (" - must RESET the board to recover.\n");
-}
-
-static image_header_t *image_get_fdt (ulong fdt_addr)
-{
- image_header_t *fdt_hdr = (image_header_t *)fdt_addr;
-
- image_print_contents (fdt_hdr);
-
- puts (" Verifying Checksum ... ");
- if (!image_check_hcrc (fdt_hdr)) {
- fdt_error ("fdt header checksum invalid");
- return NULL;
- }
-
- if (!image_check_dcrc (fdt_hdr)) {
- fdt_error ("fdt checksum invalid");
- return NULL;
- }
- puts ("OK\n");
-
- if (!image_check_type (fdt_hdr, IH_TYPE_FLATDT)) {
- fdt_error ("uImage is not a fdt");
- return NULL;
- }
- if (image_get_comp (fdt_hdr) != IH_COMP_NONE) {
- fdt_error ("uImage is compressed");
- return NULL;
- }
- if (fdt_check_header ((char *)image_get_data (fdt_hdr)) != 0) {
- fdt_error ("uImage data is not a fdt");
- return NULL;
- }
- return fdt_hdr;
-}
-
-static int boot_get_fdt (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
- bootm_headers_t *images, char **of_flat_tree, ulong *of_size)
-{
- ulong fdt_addr;
- image_header_t *fdt_hdr;
- char *fdt_blob = NULL;
- ulong image_start, image_end;
- ulong load_start, load_end;
-#if defined(CONFIG_FIT)
- void *fit_hdr;
- const char *fit_uname_config = NULL;
- const char *fit_uname_fdt = NULL;
- ulong default_addr;
-#endif
-
- if (argc > 3) {
-#if defined(CONFIG_FIT)
- /*
- * If the FDT blob comes from the FIT image and the FIT image
- * address is omitted in the command line argument, try to use
- * ramdisk or os FIT image address or default load address.
- */
- if (images->fit_uname_rd)
- default_addr = (ulong)images->fit_hdr_rd;
- else if (images->fit_uname_os)
- default_addr = (ulong)images->fit_hdr_os;
- else
- default_addr = load_addr;
-
- if (fit_parse_conf (argv[3], default_addr,
- &fdt_addr, &fit_uname_config)) {
- debug ("* fdt: config '%s' from image at 0x%08lx\n",
- fit_uname_config, fdt_addr);
- } else if (fit_parse_subimage (argv[3], default_addr,
- &fdt_addr, &fit_uname_fdt)) {
- debug ("* fdt: subimage '%s' from image at 0x%08lx\n",
- fit_uname_fdt, fdt_addr);
- } else
-#endif
- {
- fdt_addr = simple_strtoul(argv[3], NULL, 16);
- debug ("* fdt: cmdline image address = 0x%08lx\n",
- fdt_addr);
- }
-
- debug ("## Checking for 'FDT'/'FDT image' at %08lx\n",
- fdt_addr);
-
- /* copy from dataflash if needed */
- fdt_addr = genimg_get_image (fdt_addr);
-
- /*
- * Check if there is an FDT image at the
- * address provided in the second bootm argument
- * check image type, for FIT images get a FIT node.
- */
- switch (genimg_get_format ((void *)fdt_addr)) {
- case IMAGE_FORMAT_LEGACY:
- debug ("* fdt: legacy format image\n");
-
- /* verify fdt_addr points to a valid image header */
- printf ("## Flattened Device Tree Legacy Image at %08lx\n",
- fdt_addr);
- fdt_hdr = image_get_fdt (fdt_addr);
- if (!fdt_hdr)
- goto error;
-
- /*
- * move image data to the load address,
- * make sure we don't overwrite initial image
- */
- 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");
- goto error;
- }
- memmove ((void *)image_get_load (fdt_hdr),
- (void *)image_get_data (fdt_hdr),
- image_get_data_size (fdt_hdr));
-
- fdt_blob = (char *)image_get_load (fdt_hdr);
- break;
- case IMAGE_FORMAT_FIT:
- /*
- * This case will catch both: new uImage format
- * (libfdt based) and raw FDT blob (also libfdt
- * based).
- */
-#if defined(CONFIG_FIT)
- /* check FDT blob vs FIT blob */
- if (0) { /* FIXME: call FIT format verification */
- /*
- * FIT image
- */
- fit_hdr = (void *)fdt_addr;
- debug ("* fdt: FIT format image\n");
- fit_unsupported_reset ("PPC fdt");
- goto error;
- } else
-#endif
- {
- /*
- * FDT blob
- */
- debug ("* fdt: raw FDT blob\n");
- printf ("## Flattened Device Tree blob at %08lx\n", fdt_blob);
- fdt_blob = (char *)fdt_addr;
- }
- break;
- default:
- fdt_error ("Did not find a cmdline Flattened Device Tree");
- goto error;
- }
-
- printf (" Booting using the fdt blob at 0x%x\n", fdt_blob);
-
- } else if (images->legacy_hdr_valid &&
- image_check_type (images->legacy_hdr_os, IH_TYPE_MULTI)) {
-
- ulong fdt_data, fdt_len;
-
- /*
- * Now check if we have a legacy multi-component image,
- * get second entry data start address and len.
- */
- printf ("## Flattened Device Tree from multi "
- "component Image at %08lX\n",
- (ulong)images->legacy_hdr_os);
-
- image_multi_getimg (images->legacy_hdr_os, 2, &fdt_data, &fdt_len);
- if (fdt_len) {
-
- fdt_blob = (char *)fdt_data;
- printf (" Booting using the fdt at 0x%x\n", fdt_blob);
-
- if (fdt_check_header (fdt_blob) != 0) {
- fdt_error ("image is not a fdt");
- goto error;
- }
-
- if (be32_to_cpu (fdt_totalsize (fdt_blob)) != fdt_len) {
- fdt_error ("fdt size != image size");
- goto error;
- }
- } else {
- fdt_error ("Did not find a Flattened Device Tree "
- "in a legacy multi-component image");
- goto error;
- }
- } else {
- debug ("## No Flattened Device Tree\n");
- *of_flat_tree = NULL;
- *of_size = 0;
- return 0;
- }
-
- *of_flat_tree = fdt_blob;
- *of_size = be32_to_cpu (fdt_totalsize (fdt_blob));
- debug (" of_flat_tree at 0x%08lx size 0x%08lx\n",
- *of_flat_tree, *of_size);
-
- return 0;
-
-error:
- do_reset (cmdtp, flag, argc, argv);
- return 1;
-}
-
-static int boot_relocate_fdt (struct lmb *lmb, ulong bootmap_base,
- cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
- char **of_flat_tree, ulong *of_size)
-{
- char *fdt_blob = *of_flat_tree;
- ulong relocate = 0;
- ulong of_len = 0;
-
- /* nothing to do */
- if (*of_size == 0)
- return 0;
-
- if (fdt_check_header (fdt_blob) != 0) {
- fdt_error ("image is not a fdt");
- goto error;
- }
-
-#ifndef CFG_NO_FLASH
- /* move the blob if it is in flash (set relocate) */
- if (addr2info ((ulong)fdt_blob) != NULL)
- relocate = 1;
-#endif
-
- /*
- * The blob must be within CFG_BOOTMAPSZ,
- * so we flag it to be copied if it is not.
- */
- if (fdt_blob >= (char *)CFG_BOOTMAPSZ)
- relocate = 1;
-
- of_len = be32_to_cpu (fdt_totalsize (fdt));
-
- /* move flattend device tree if needed */
- if (relocate) {
- int err;
- ulong of_start;
-
- /* position on a 4K boundary before the alloc_current */
- of_start = lmb_alloc_base(lmb, of_len, 0x1000,
- (CFG_BOOTMAPSZ + bootmap_base));
-
- if (of_start == 0) {
- puts("device tree - allocation error\n");
- goto error;
- }
-
- debug ("## device tree at 0x%08lX ... 0x%08lX (len=%ld=0x%lX)\n",
- (ulong)fdt_blob, (ulong)fdt_blob + of_len - 1,
- of_len, of_len);
-
- printf (" Loading Device Tree to %08lx, end %08lx ... ",
- of_start, of_start + of_len - 1);
-
- err = fdt_open_into (fdt_blob, (void *)of_start, of_len);
- if (err != 0) {
- fdt_error ("fdt move failed");
- goto error;
- }
- puts ("OK\n");
-
- *of_flat_tree = (char *)of_start;
- } else {
- *of_flat_tree = fdt_blob;
- lmb_reserve(lmb, (ulong)fdt, of_len);
- }
-
- return 0;
-
-error:
- return 1;
-}
-#endif