#include <fdt.h>
#include <libfdt.h>
#include <fdt_support.h>
-#endif
-#ifdef CONFIG_LOGBUFFER
-#include <logbuff.h>
+static void fdt_error (const char *msg);
+static int 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 fdt_relocate (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);
-#if defined(CONFIG_CMD_BDI)
-extern int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
+#ifndef CFG_LINUX_LOWMEM_MAX_SIZE
+#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[],
- image_header_t *hdr,
- int verify)
+do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
+ bootm_headers_t *images)
{
- ulong initrd_high;
- int initrd_copy_to_ram = 1;
- ulong initrd_start, initrd_end;
- ulong rd_data, rd_len;
- image_header_t *rd_hdr;
+ ulong sp;
- ulong cmd_start, cmd_end;
- char *cmdline;
+ ulong initrd_start, initrd_end;
+ ulong rd_data_start, rd_data_end, rd_len;
+ ulong size;
- ulong sp;
- char *s;
+ ulong cmd_start, cmd_end, bootmap_base;
bd_t *kbd;
+ ulong ep = 0;
void (*kernel)(bd_t *, ulong, ulong, ulong, ulong);
+ int ret;
+ ulong of_size = 0;
+ struct lmb *lmb = images->lmb;
#if defined(CONFIG_OF_LIBFDT)
- image_header_t *fdt_hdr;
char *of_flat_tree = NULL;
- ulong of_data = 0;
#endif
- if ((s = getenv ("initrd_high")) != NULL) {
- /* a value of "no" or a similar string will act like 0,
- * turning the "load high" feature off. This is intentional.
- */
- initrd_high = simple_strtoul(s, NULL, 16);
- if (initrd_high == ~0)
- initrd_copy_to_ram = 0;
- } else { /* not set, no restrictions to load high */
- initrd_high = ~0;
- }
+ bootmap_base = getenv_bootm_low();
+ size = getenv_bootm_size();
-#ifdef CONFIG_LOGBUFFER
- kbd=gd->bd;
- /* Prevent initrd from overwriting logbuffer */
- if (initrd_high < (kbd->bi_memsize-LOGBUFF_LEN-LOGBUFF_OVERHEAD))
- initrd_high = kbd->bi_memsize-LOGBUFF_LEN-LOGBUFF_OVERHEAD;
- debug ("## Logbuffer at 0x%08lX ", kbd->bi_memsize-LOGBUFF_LEN);
+#ifdef DEBUG
+ if (((u64)bootmap_base + 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())
+ puts("WARNING: bootm_low + bootm_size exceed eff. memory\n");
#endif
+ size = min(size, get_effective_memsize());
+ size = min(size, CFG_LINUX_LOWMEM_MAX_SIZE);
+
+ if (size < getenv_bootm_size()) {
+ ulong base = bootmap_base + size;
+ printf("WARNING: adjusting available memory to %x\n", size);
+ lmb_reserve(lmb, base, getenv_bootm_size() - size);
+ }
+
/*
* Booting a (Linux) kernel image
*
* memory, which means far enough below the current stack
* pointer.
*/
+ sp = get_sp();
+ debug ("## Current stack ends at 0x%08lx\n", sp);
- asm( "mr %0,1": "=r"(sp) : );
+ /* adjust sp by 1K to be safe */
+ sp -= 1024;
+ lmb_reserve(lmb, sp, (CFG_SDRAM_BASE + get_effective_memsize() - sp));
- debug ("## Current stack ends at 0x%08lX ", sp);
+#if defined(CONFIG_OF_LIBFDT)
+ /* find flattened device tree */
+ ret = get_fdt (cmdtp, flag, argc, argv, images, &of_flat_tree, &of_size);
- sp -= 2048; /* just to be sure */
- if (sp > CFG_BOOTMAPSZ)
- sp = CFG_BOOTMAPSZ;
- sp &= ~0xF;
+ if (ret)
+ goto error;
+#endif
- debug ("=> set upper limit to 0x%08lX\n", sp);
+ if (!of_size) {
+ /* allocate space and init command line */
+ ret = get_boot_cmdline (lmb, &cmd_start, &cmd_end, bootmap_base);
+ if (ret) {
+ puts("ERROR with allocation of cmdline\n");
+ goto error;
+ }
- cmdline = (char *)((sp - CFG_BARGSIZE) & ~0xF);
- kbd = (bd_t *)(((ulong)cmdline - sizeof(bd_t)) & ~0xF);
+ /* allocate space for kernel copy of board info */
+ ret = get_boot_kbd (lmb, &kbd, bootmap_base);
+ if (ret) {
+ puts("ERROR with allocation of kernel bd\n");
+ goto error;
+ }
+ set_clocks_in_mhz(kbd);
+ }
- if ((s = getenv("bootargs")) == NULL)
- s = "";
+ /* 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;
- strcpy (cmdline, s);
+ /* find ramdisk */
+ ret = get_ramdisk (cmdtp, flag, argc, argv, images,
+ IH_ARCH_PPC, &rd_data_start, &rd_data_end);
- cmd_start = (ulong)&cmdline[0];
- cmd_end = cmd_start + strlen(cmdline);
+ if (ret)
+ goto error;
- *kbd = *(gd->bd);
+ rd_len = rd_data_end - rd_data_start;
-#ifdef DEBUG
- printf ("## cmdline at 0x%08lX ... 0x%08lX\n", cmd_start, cmd_end);
+#if defined(CONFIG_OF_LIBFDT)
+ ret = fdt_relocate (lmb, bootmap_base,
+ cmdtp, flag, argc, argv, &of_flat_tree, &of_size);
-#if defined(CONFIG_CMD_BDI)
- do_bdinfo (NULL, 0, 0, NULL);
+ /*
+ * 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");
+ 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
+ }
+#endif /* CONFIG_OF_LIBFDT */
+
+ ret = ramdisk_high (lmb, rd_data_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);
+ }
+#endif
+ debug ("## Transferring control to Linux (at address %08lx) ...\n",
+ (ulong)kernel);
+
+ show_boot_progress (15);
+
+#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
+ */
+ (*kernel) ((bd_t *)of_flat_tree, (ulong)kernel, 0, 0, 0);
+ /* does not return */
+ }
#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 ;
+
+error:
+ if (images->autostart)
+ do_reset (cmdtp, flag, argc, argv);
+ return ;
+}
+
+static ulong get_sp (void)
+{
+ ulong sp;
+
+ asm( "mr %0,1": "=r"(sp) : );
+ 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;
#if defined(CONFIG_MPC8220)
- kbd->bi_inpfreq /= 1000000L;
- kbd->bi_pcifreq /= 1000000L;
- kbd->bi_pevfreq /= 1000000L;
- kbd->bi_flbfreq /= 1000000L;
- kbd->bi_vcofreq /= 1000000L;
+ 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_pcifreq /= 1000000L;
#endif /* CONFIG_MPC5xxx */
}
-
- kernel = (void (*)(bd_t *, ulong, ulong, ulong, ulong))image_get_ep (hdr);
-
- /*
- * Check if there is an initrd image
- */
+}
#if defined(CONFIG_OF_LIBFDT)
- /* Look for a '-' which indicates to ignore the ramdisk argument */
- if (argc >= 3 && strcmp(argv[2], "-") == 0) {
- debug ("Skipping initrd\n");
- rd_len = rd_data = 0;
- }
- else
-#endif
- if (argc >= 3) {
- debug ("Not skipping initrd\n");
- show_boot_progress (9);
-
- rd_hdr = (image_header_t *)simple_strtoul (argv[2], NULL, 16);
- printf ("## Loading RAMDisk Image at %08lx ...\n", (ulong)rd_hdr);
-
- if (!image_check_magic (rd_hdr)) {
- puts ("Bad Magic Number\n");
- show_boot_progress (-10);
- do_reset (cmdtp, flag, argc, argv);
- }
-
- if (!image_check_hcrc (rd_hdr)) {
- puts ("Bad Header Checksum\n");
- show_boot_progress (-11);
- do_reset (cmdtp, flag, argc, argv);
- }
- show_boot_progress (10);
+static void fdt_error (const char *msg)
+{
+ puts ("ERROR: ");
+ puts (msg);
+ puts (" - must RESET the board to recover.\n");
+}
- print_image_hdr (rd_hdr);
+static image_header_t *image_get_fdt (ulong fdt_addr)
+{
+ image_header_t *fdt_hdr = (image_header_t *)fdt_addr;
- if (verify) {
- puts (" Verifying Checksum ... ");
+ image_print_contents (fdt_hdr);
- if (!image_check_dcrc_wd (rd_hdr, CHUNKSZ)) {
- puts ("Bad Data CRC\n");
- show_boot_progress (-12);
- do_reset (cmdtp, flag, argc, argv);
- }
- puts ("OK\n");
- }
+ puts (" Verifying Checksum ... ");
+ if (!image_check_hcrc (fdt_hdr)) {
+ fdt_error ("fdt header checksum invalid");
+ return NULL;
+ }
- show_boot_progress (11);
+ if (!image_check_dcrc (fdt_hdr)) {
+ fdt_error ("fdt checksum invalid");
+ return NULL;
+ }
+ puts ("OK\n");
- if (!image_check_os (rd_hdr, IH_OS_LINUX) ||
- !image_check_arch (rd_hdr, IH_ARCH_PPC) ||
- !image_check_type (rd_hdr, IH_TYPE_RAMDISK)) {
- puts ("No Linux PPC Ramdisk Image\n");
- show_boot_progress (-13);
- do_reset (cmdtp, flag, argc, argv);
- }
+ 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;
+}
- rd_data = image_get_data (rd_hdr);
- rd_len = image_get_data_size (rd_hdr);
+static int 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)
/*
- * Now check if we have a multifile image
+ * 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.
*/
- } else if (image_check_type (hdr, IH_TYPE_MULTI)) {
- /*
- * Get second entry data start address and len
- */
- image_multi_getimg (hdr, 1, &rd_data, &rd_len);
- show_boot_progress (13);
- } else {
- /*
- * No initrd image
- */
- show_boot_progress (14);
+ 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);
+ }
- rd_len = rd_data = 0;
- }
+ debug ("## Checking for 'FDT'/'FDT image' at %08lx\n",
+ fdt_addr);
-#if defined(CONFIG_OF_LIBFDT)
- if(argc > 3) {
- of_flat_tree = (char *) simple_strtoul(argv[3], NULL, 16);
- fdt_hdr = (image_header_t *)of_flat_tree;
+ /* copy from dataflash if needed */
+ fdt_addr = gen_get_image (fdt_addr);
- 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;
-#endif
- } else if (image_check_magic (fdt_hdr)) {
- ulong image_start, image_end;
- ulong load_start, load_end;
+ /*
+ * 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 (gen_image_get_format ((void *)fdt_addr)) {
+ case IMAGE_FORMAT_LEGACY:
+ debug ("* fdt: legacy format image\n");
- printf ("## Flat Device Tree at %08lX\n", fdt_hdr);
- print_image_hdr (fdt_hdr);
+ /* 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_end = load_start + image_get_data_size (fdt_hdr);
if ((load_start < image_end) && (load_end > image_start)) {
- puts ("ERROR: fdt overwritten - "
- "must RESET the board to recover.\n");
- do_reset (cmdtp, flag, argc, argv);
+ 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));
- puts (" Verifying Checksum ... ");
- if (!image_check_hcrc (fdt_hdr)) {
- puts ("ERROR: fdt header checksum invalid - "
- "must RESET the board to recover.\n");
- do_reset (cmdtp, flag, argc, argv);
+ 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;
+ }
- if (!image_check_dcrc (fdt_hdr)) {
- puts ("ERROR: fdt checksum invalid - "
- "must RESET the board to recover.\n");
- do_reset (cmdtp, flag, argc, argv);
- }
- puts ("OK\n");
+ printf (" Booting using the fdt blob at 0x%x\n", fdt_blob);
- if (!image_check_type (fdt_hdr, IH_TYPE_FLATDT)) {
- puts ("ERROR: uImage is not a fdt - "
- "must RESET the board to recover.\n");
- do_reset (cmdtp, flag, argc, argv);
- }
- if (image_get_comp (fdt_hdr) != IH_COMP_NONE) {
- puts ("ERROR: uImage is compressed - "
- "must RESET the board to recover.\n");
- do_reset (cmdtp, flag, argc, argv);
- }
- if (fdt_check_header (of_flat_tree + image_get_header_size ()) != 0) {
- puts ("ERROR: uImage data is not a fdt - "
- "must RESET the board to recover.\n");
- do_reset (cmdtp, flag, argc, argv);
- }
+ } else if (images->legacy_hdr_valid &&
+ image_check_type (images->legacy_hdr_os, IH_TYPE_MULTI)) {
- 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 {
- puts ("Did not find a flat Flat Device Tree.\n"
- "Must RESET the board to recover.\n");
- 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) {
+ /*
+ * 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);
- of_flat_tree = (char *)fdt_data;
+ image_multi_getimg (images->legacy_hdr_os, 2, &fdt_data, &fdt_len);
+ if (fdt_len) {
-#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
+ fdt_blob = (char *)fdt_data;
+ printf (" Booting using the fdt at 0x%x\n", fdt_blob);
- if (fdt_check_header (of_flat_tree) != 0) {
- puts ("ERROR: image is not a fdt - "
- "must RESET the board to recover.\n");
- do_reset (cmdtp, flag, argc, argv);
+ if (fdt_check_header (fdt_blob) != 0) {
+ fdt_error ("image is not a fdt");
+ goto error;
}
- if (be32_to_cpu (fdt_totalsize (of_flat_tree)) != fdt_len) {
- puts ("ERROR: fdt size != image size - "
- "must RESET the board to recover.\n");
- do_reset (cmdtp, flag, argc, argv);
+ 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;
}
-#endif
- if (!rd_data) {
- debug ("No initrd\n");
- }
-
- if (rd_data) {
- if (!initrd_copy_to_ram) { /* zero-copy ramdisk support */
- initrd_start = rd_data;
- initrd_end = initrd_start + rd_len;
- } else {
- initrd_start = (ulong)kbd - rd_len;
- initrd_start &= ~(4096 - 1); /* align on page */
- if (initrd_high) {
- ulong nsp;
+ *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);
- /*
- * the inital ramdisk does not need to be within
- * CFG_BOOTMAPSZ as it is not accessed until after
- * the mm system is initialised.
- *
- * do the stack bottom calculation again and see if
- * the initrd will fit just below the monitor stack
- * bottom without overwriting the area allocated
- * above for command line args and board info.
- */
- asm( "mr %0,1": "=r"(nsp) : );
- nsp -= 2048; /* just to be sure */
- nsp &= ~0xF;
- if (nsp > initrd_high) /* limit as specified */
- nsp = initrd_high;
- nsp -= rd_len;
- nsp &= ~(4096 - 1); /* align on page */
- if (nsp >= sp)
- initrd_start = nsp;
- }
-
- show_boot_progress (12);
+ return 0;
- debug ("## initrd at 0x%08lX ... 0x%08lX (len=%ld=0x%lX)\n",
- rd_data, rd_data + rd_len - 1, rd_len, rd_len);
+error:
+ do_reset (cmdtp, flag, argc, argv);
+ return 1;
+}
- initrd_end = initrd_start + rd_len;
- printf (" Loading Ramdisk to %08lx, end %08lx ... ",
- initrd_start, initrd_end);
+static int fdt_relocate (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;
- memmove_wd((void *)initrd_start,
- (void *)rd_data, rd_len, CHUNKSZ);
+ /* nothing to do */
+ if (*of_size == 0)
+ return 0;
- puts ("OK\n");
- }
- } else {
- initrd_start = 0;
- initrd_end = 0;
+ if (fdt_check_header (fdt_blob) != 0) {
+ fdt_error ("image is not a fdt");
+ goto error;
}
-#if defined(CONFIG_OF_LIBFDT)
+#ifndef CFG_NO_FLASH
+ /* move the blob if it is in flash (set relocate) */
+ if (addr2info ((ulong)fdt_blob) != NULL)
+ relocate = 1;
+#endif
-#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
+ if (fdt_blob >= (char *)CFG_BOOTMAPSZ)
+ relocate = 1;
+
+ of_len = be32_to_cpu (fdt_totalsize (fdt));
- /* move of_flat_tree if needed */
- if (of_data) {
+ /* move flattend device tree if needed */
+ if (relocate) {
int err;
- ulong of_start, of_len;
+ ulong of_start;
- of_len = be32_to_cpu(fdt_totalsize(of_data));
+ /* 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;
+ }
- /* 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);
+ (ulong)fdt_blob, (ulong)fdt_blob + 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);
+
+ err = fdt_open_into (fdt_blob, (void *)of_start, of_len);
if (err != 0) {
- puts ("ERROR: fdt move failed - "
- "must RESET the board to recover.\n");
- do_reset (cmdtp, flag, argc, argv);
+ fdt_error ("fdt move failed");
+ goto error;
}
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) {
- puts ("ERROR: /chosen node create failed - "
- "must RESET the board to recover.\n");
- do_reset (cmdtp, flag, argc, argv);
- }
-#ifdef CONFIG_OF_HAS_UBOOT_ENV
- if (fdt_env(of_flat_tree) < 0) {
- puts ("ERROR: /u-boot-env node create failed - "
- "must RESET the board to recover.\n");
- do_reset (cmdtp, flag, argc, argv);
- }
-#endif
-#ifdef CONFIG_OF_HAS_BD_T
- if (fdt_bd_t(of_flat_tree) < 0) {
- puts ("ERROR: /bd_t node create failed - "
- "must RESET the board to recover.\n");
- 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);
-#endif
- }
-#endif /* CONFIG_OF_LIBFDT */
-
- debug ("## Transferring control to Linux (at address %08lx) ...\n",
- (ulong)kernel);
- show_boot_progress (15);
+ *of_flat_tree = (char *)of_start;
+ } else {
+ *of_flat_tree = fdt_blob;
+ lmb_reserve(lmb, (ulong)fdt, of_len);
+ }
-#if defined(CFG_INIT_RAM_LOCK) && !defined(CONFIG_E500)
- unlock_ram_in_cache();
-#endif
+ 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 */
- }
-#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 */
+error:
+ return 1;
}
+#endif
projects / karo-tx-uboot.git / blobdiff