]> git.sur5r.net Git - u-boot/blobdiff - lib_ppc/bootm.c
Cleanup coding style, update CHANGELOG
[u-boot] / lib_ppc / bootm.c
index 391168787a97cf0c1445e1bf1d9b54f26c2f152f..b893146fcb5be2cdb17ddb4941a9f64393d7b046 100644 (file)
@@ -23,7 +23,6 @@
  * MA 02111-1307 USA
  */
 
-#define DEBUG
 
 #include <common.h>
 #include <watchdog.h>
 #include <fdt.h>
 #include <libfdt.h>
 #include <fdt_support.h>
-#elif defined(CONFIG_OF_FLAT_TREE)
-#include <ft_build.h>
-#endif
 
-#ifdef CONFIG_LOGBUFFER
-#include <logbuff.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);
 
-#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_FLAT_TREE) || defined(CONFIG_OF_LIBFDT)
-       image_header_t *fdt_hdr;
+#if defined(CONFIG_OF_LIBFDT)
        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
         *
@@ -113,160 +112,403 @@ do_bootm_linux(cmd_tbl_t *cmdtp, int flag,
         * 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 = boot_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 = boot_get_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 = boot_get_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) {
+               ret = fit_image_get_entry (images->fit_hdr_os,
+                               images->fit_noffset_os, &ep);
+               if (ret) {
+                       puts ("Can't get entry point property!\n");
+                       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 = boot_get_ramdisk (argc, argv, images, IH_ARCH_PPC,
+                       &rd_data_start, &rd_data_end);
+       if (ret)
+               goto error;
 
-       cmd_start    = (ulong)&cmdline[0];
-       cmd_end      = cmd_start + strlen(cmdline);
+       rd_len = rd_data_end - rd_data_start;
 
-       *kbd = *(gd->bd);
+#if defined(CONFIG_OF_LIBFDT)
+       ret = boot_relocate_fdt (lmb, bootmap_base,
+               cmdtp, flag, argc, argv, &of_flat_tree, &of_size);
 
-#ifdef DEBUG
-       printf ("## cmdline at 0x%08lX ... 0x%08lX\n", cmd_start, cmd_end);
+       /*
+        * 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 = boot_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;
+                       }
+               }
 
-#if defined(CONFIG_CMD_BDI)
-       do_bdinfo (NULL, 0, 0, NULL);
+               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
+                */
+               debug ("   Booting using OF flat tree...\n");
+               (*kernel) ((bd_t *)of_flat_tree, (ulong)kernel, 0, 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
+                */
+               debug ("   Booting using board info...\n");
+               (*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_brgfreq /= 1000000L;
                kbd->bi_sccfreq /= 1000000L;
-               kbd->bi_vco     /= 1000000L;
+               kbd->bi_vco     /= 1000000L;
 #endif
 #if defined(CONFIG_MPC5xxx)
                kbd->bi_ipbfreq /= 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)
+static void fdt_error (const char *msg)
+{
+       puts ("ERROR: ");
+       puts (msg);
+       puts (" - must RESET the board to recover.\n");
+}
 
-#if defined(CONFIG_OF_FLAT_TREE) || 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);
+static image_header_t *image_get_fdt (ulong fdt_addr)
+{
+       image_header_t *fdt_hdr = (image_header_t *)fdt_addr;
 
-               rd_hdr = (image_header_t *)simple_strtoul (argv[2], NULL, 16);
-               printf ("## Loading RAMDisk Image at %08lx ...\n", (ulong)rd_hdr);
+       image_print_contents (fdt_hdr);
 
-               if (!image_check_magic (rd_hdr)) {
-                       puts ("Bad Magic Number\n");
-                       show_boot_progress (-10);
-                       do_reset (cmdtp, flag, argc, argv);
-               }
+       puts ("   Verifying Checksum ... ");
+       if (!image_check_hcrc (fdt_hdr)) {
+               fdt_error ("fdt header checksum invalid");
+               return NULL;
+       }
 
-               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);
+       if (!image_check_dcrc (fdt_hdr)) {
+               fdt_error ("fdt checksum invalid");
+               return NULL;
+       }
+       puts ("OK\n");
 
-               print_image_hdr (rd_hdr);
+       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;
+}
 
-               if (verify) {
-                       puts ("   Verifying Checksum ... ");
+/**
+ * fit_check_fdt - verify FIT format FDT subimage
+ * @fit_hdr: pointer to the FIT  header
+ * fdt_noffset: FDT subimage node offset within FIT image
+ * @verify: data CRC verification flag
+ *
+ * fit_check_fdt() verifies integrity of the FDT subimage and from
+ * specified FIT image.
+ *
+ * returns:
+ *     1, on success
+ *     0, on failure
+ */
+#if defined(CONFIG_FIT)
+static int fit_check_fdt (const void *fit, int fdt_noffset, int verify)
+{
+       fit_image_print (fit, fdt_noffset, "   ");
 
-                       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");
+       if (verify) {
+               puts ("   Verifying Hash Integrity ... ");
+               if (!fit_image_check_hashes (fit, fdt_noffset)) {
+                       fdt_error ("Bad Data Hash");
+                       return 0;
                }
+               puts ("OK\n");
+       }
 
-               show_boot_progress (11);
+       if (!fit_image_check_type (fit, fdt_noffset, IH_TYPE_FLATDT)) {
+               fdt_error ("Not a FDT image");
+               return 0;
+       }
 
-               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 (!fit_image_check_comp (fit, fdt_noffset, IH_COMP_NONE)) {
+               fdt_error ("FDT image is compressed");
+               return 0;
+       }
 
-               rd_data = image_get_data (rd_hdr);
-               rd_len = image_get_data_size (rd_hdr);
+       return 1;
+}
+#endif /* CONFIG_FIT */
 
-               /*
-                * Now check if we have a multifile image
-                */
-       } 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);
+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;
+       int             cfg_noffset;
+       int             fdt_noffset;
+       const void      *data;
+       size_t          size;
+#endif
 
-               rd_len = rd_data = 0;
-       }
+       *of_flat_tree = NULL;
+       *of_size = 0;
 
-#if defined(CONFIG_OF_FLAT_TREE) || 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;
-#if defined(CONFIG_OF_FLAT_TREE)
-               if (*((ulong *)(of_flat_tree)) == OF_DT_HEADER) {
-#elif defined(CONFIG_OF_LIBFDT)
-               if (fdt_check_header (of_flat_tree) == 0) {
+       if (argc > 3 || genimg_has_config (images)) {
+#if defined(CONFIG_FIT)
+               if (argc > 3) {
+                       /*
+                        * 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
-#ifndef CFG_NO_FLASH
-                       if (addr2info((ulong)of_flat_tree) != NULL)
-                               of_data = (ulong)of_flat_tree;
+                       {
+                               fdt_addr = simple_strtoul(argv[3], NULL, 16);
+                               debug ("*  fdt: cmdline image address = 0x%08lx\n",
+                                               fdt_addr);
+                       }
+#if defined(CONFIG_FIT)
+               } else {
+                       /* use FIT configuration provided in first bootm
+                        * command argument
+                        */
+                       fdt_addr = (ulong)images->fit_hdr_os;
+                       fit_uname_config = images->fit_uname_cfg;
+                       debug ("*  fdt: using config '%s' from image at 0x%08lx\n",
+                                       fit_uname_config, fdt_addr);
+
+                       /*
+                        * Check whether configuration has FDT blob defined,
+                        * if not quit silently.
+                        */
+                       fit_hdr = (void *)fdt_addr;
+                       cfg_noffset = fit_conf_get_node (fit_hdr,
+                                       fit_uname_config);
+                       if (cfg_noffset < 0) {
+                               debug ("*  fdt: no such config\n");
+                               return 0;
+                       }
+
+                       fdt_noffset = fit_conf_get_fdt_node (fit_hdr,
+                                       cfg_noffset);
+                       if (fdt_noffset < 0) {
+                               debug ("*  fdt: no fdt in config\n");
+                               return 0;
+                       }
+               }
 #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);
+               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:
+                       /* verify fdt_addr points to a valid image header */
+                       printf ("## Flattened Device Tree from 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);
 
@@ -274,281 +516,259 @@ do_bootm_linux(cmd_tbl_t *cmdtp, int flag,
                        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;
                        }
 
-                       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);
-                       }
+                       debug ("   Loading FDT from 0x%08lx to 0x%08lx\n",
+                                       image_get_data (fdt_hdr), load_start);
 
-                       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");
+                       memmove ((void *)load_start,
+                                       (void *)image_get_data (fdt_hdr),
+                                       image_get_data_size (fdt_hdr));
 
-                       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 defined(CONFIG_OF_FLAT_TREE)
-                       if (*((ulong *)(of_flat_tree + image_get_header_size ())) != OF_DT_HEADER) {
-#elif defined(CONFIG_OF_LIBFDT)
-                       if (fdt_check_header (of_flat_tree + image_get_header_size ()) != 0) {
+                       fdt_blob = (char *)load_start;
+                       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 (fit_check_format ((const void *)fdt_addr)) {
+                               /*
+                                * FIT image
+                                */
+                               fit_hdr = (void *)fdt_addr;
+                               printf ("## Flattened Device Tree from FIT Image at %08lx\n",
+                                               fdt_addr);
+
+                               if (!fit_uname_fdt) {
+                                       /*
+                                        * no FDT blob image node unit name,
+                                        * try to get config node first. If
+                                        * config unit node name is NULL
+                                        * fit_conf_get_node() will try to
+                                        * find default config node
+                                        */
+                                       cfg_noffset = fit_conf_get_node (fit_hdr,
+                                                       fit_uname_config);
+
+                                       if (cfg_noffset < 0) {
+                                               fdt_error ("Could not find configuration node\n");
+                                               goto error;
+                                       }
+
+                                       fit_uname_config = fdt_get_name (fit_hdr,
+                                                       cfg_noffset, NULL);
+                                       printf ("   Using '%s' configuration\n",
+                                                       fit_uname_config);
+
+                                       fdt_noffset = fit_conf_get_fdt_node (fit_hdr,
+                                                       cfg_noffset);
+                                       fit_uname_fdt = fit_get_name (fit_hdr,
+                                                       fdt_noffset, NULL);
+                               } else {
+                                       /* get FDT component image node offset */
+                                       fdt_noffset = fit_image_get_node (fit_hdr,
+                                                       fit_uname_fdt);
+                               }
+                               if (fdt_noffset < 0) {
+                                       fdt_error ("Could not find subimage node\n");
+                                       goto error;
+                               }
+
+                               printf ("   Trying '%s' FDT blob subimage\n",
+                                               fit_uname_fdt);
+
+                               if (!fit_check_fdt (fit_hdr, fdt_noffset,
+                                                       images->verify))
+                                       goto error;
+
+                               /* get ramdisk image data address and length */
+                               if (fit_image_get_data (fit_hdr, fdt_noffset,
+                                                       &data, &size)) {
+                                       fdt_error ("Could not find FDT subimage data");
+                                       goto error;
+                               }
+
+                               /* verift that image data is a proper FDT blob */
+                               if (fdt_check_header ((char *)data) != 0) {
+                                       fdt_error ("Subimage data is not a FTD");
+                                       goto error;
+                               }
+
+                               /*
+                                * move image data to the load address,
+                                * make sure we don't overwrite initial image
+                                */
+                               image_start = (ulong)fit_hdr;
+                               image_end = fit_get_end (fit_hdr);
+
+                               if (fit_image_get_load (fit_hdr, fdt_noffset,
+                                                       &load_start) == 0) {
+                                       load_end = load_start + size;
+
+                                       if ((load_start < image_end) &&
+                                                       (load_end > image_start)) {
+                                               fdt_error ("FDT overwritten");
+                                               goto error;
+                                       }
+
+                                       printf ("   Loading FDT from 0x%08lx to 0x%08lx\n",
+                                                       (ulong)data, load_start);
+
+                                       memmove ((void *)load_start,
+                                                       (void *)data, size);
+
+                                       fdt_blob = (char *)load_start;
+                               } else {
+                                       fdt_blob = (char *)data;
+                               }
+
+                               images->fit_hdr_fdt = fit_hdr;
+                               images->fit_uname_fdt = fit_uname_fdt;
+                               images->fit_noffset_fdt = fdt_noffset;
+                               break;
+                       } else
 #endif
-                               puts ("ERROR: uImage data is not a fdt - "
-                                       "must RESET the board to recover.\n");
-                               do_reset (cmdtp, flag, argc, argv);
+                       {
+                               /*
+                                * 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;
+               }
 
-                       memmove ((void *)image_get_load (fdt_hdr),
-                               (void *)(of_flat_tree + image_get_header_size ()),
-                               image_get_data_size (fdt_hdr));
+               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)) {
 
-                       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 defined(CONFIG_OF_FLAT_TREE)
-                       if (*((ulong *)(of_flat_tree)) != OF_DT_HEADER) {
-#elif defined(CONFIG_OF_LIBFDT)
-                       if (fdt_check_header (of_flat_tree) != 0) {
-#endif
-                               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 defined(CONFIG_OF_FLAT_TREE)
-                       if (((struct boot_param_header *)of_flat_tree)->totalsize != fdt_len) {
-#elif defined(CONFIG_OF_LIBFDT)
-                       if (be32_to_cpu (fdt_totalsize (of_flat_tree)) != fdt_len) {
-#endif
-                               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");
+               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;
 
-                       /*
-                        * 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;
-               }
+       *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);
 
-               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 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;
 
-               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_blob));
 
-       /* 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
-       }
 
-#elif defined(CONFIG_OF_FLAT_TREE)
-
-#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) {
-               ulong of_start, of_len;
-               of_len = ((struct boot_param_header *)of_data)->totalsize;
-
-               /* provide extra 8k pad */
-               of_start  = (ulong)kbd - of_len - 8192;
-               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);
-               memmove ((void *)of_start, (void *)of_data, of_len);
-               puts ("OK\n");
+               *of_flat_tree = (char *)of_start;
+       } else {
+               *of_flat_tree = fdt_blob;
+               lmb_reserve(lmb, (ulong)fdt, of_len);
        }
-       /*
-        * Create the /chosen node and modify the blob with board specific
-        * values as needed.
-        */
-       ft_setup(of_flat_tree, kbd, initrd_start, initrd_end);
-       /* ft_dump_blob(of_flat_tree); */
-
-#endif /* #if defined(CONFIG_OF_LIBFDT) #elif defined(CONFIG_OF_FLAT_TREE) */
 
-       debug ("## Transferring control to Linux (at address %08lx) ...\n",
-               (ulong)kernel);
+       return 0;
 
-       show_boot_progress (15);
-
-#if defined(CFG_INIT_RAM_LOCK) && !defined(CONFIG_E500)
-       unlock_ram_in_cache();
-#endif
-
-#if defined(CONFIG_OF_FLAT_TREE) || 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