image: Split board code out into its own file
authorSimon Glass <sjg@chromium.org>
Sat, 25 Sep 2021 13:03:15 +0000 (07:03 -0600)
committerTom Rini <trini@konsulko.com>
Fri, 8 Oct 2021 19:53:26 +0000 (15:53 -0400)
To avoid a large #ifdef in the image.c file, move the affected code into
a separate file.

Avoid any style fix-ups for easier review. Those are in the next patch.

Signed-off-by: Simon Glass <sjg@chromium.org>
common/Makefile
common/image-board.c [new file with mode: 0644]
common/image.c

index fb8173a..e783902 100644 (file)
@@ -101,7 +101,7 @@ obj-y += malloc_simple.o
 endif
 endif
 
-obj-y += image.o
+obj-y += image.o image-board.o
 obj-$(CONFIG_$(SPL_TPL_)HASH) += hash.o
 obj-$(CONFIG_ANDROID_AB) += android_ab.o
 obj-$(CONFIG_ANDROID_BOOT_IMAGE) += image-android.o image-android-dt.o
diff --git a/common/image-board.c b/common/image-board.c
new file mode 100644 (file)
index 0000000..63cbf5f
--- /dev/null
@@ -0,0 +1,925 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Image code used by boards (and not host tools)
+ *
+ * (C) Copyright 2008 Semihalf
+ *
+ * (C) Copyright 2000-2006
+ * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
+ */
+
+#include <common.h>
+#include <bootstage.h>
+#include <cpu_func.h>
+#include <env.h>
+#include <fpga.h>
+#include <image.h>
+#include <mapmem.h>
+#include <watchdog.h>
+#include <asm/cache.h>
+#include <asm/global_data.h>
+
+#ifndef CONFIG_SYS_BARGSIZE
+#define CONFIG_SYS_BARGSIZE 512
+#endif
+
+DECLARE_GLOBAL_DATA_PTR;
+
+#if CONFIG_IS_ENABLED(LEGACY_IMAGE_FORMAT)
+/**
+ * image_get_ramdisk - get and verify ramdisk image
+ * @rd_addr: ramdisk image start address
+ * @arch: expected ramdisk architecture
+ * @verify: checksum verification flag
+ *
+ * image_get_ramdisk() returns a pointer to the verified ramdisk image
+ * header. Routine receives image start address and expected architecture
+ * flag. Verification done covers data and header integrity and os/type/arch
+ * fields checking.
+ *
+ * returns:
+ *     pointer to a ramdisk image header, if image was found and valid
+ *     otherwise, return NULL
+ */
+static const image_header_t *image_get_ramdisk(ulong rd_addr, uint8_t arch,
+                                               int verify)
+{
+       const image_header_t *rd_hdr = (const image_header_t *)rd_addr;
+
+       if (!image_check_magic(rd_hdr)) {
+               puts("Bad Magic Number\n");
+               bootstage_error(BOOTSTAGE_ID_RD_MAGIC);
+               return NULL;
+       }
+
+       if (!image_check_hcrc(rd_hdr)) {
+               puts("Bad Header Checksum\n");
+               bootstage_error(BOOTSTAGE_ID_RD_HDR_CHECKSUM);
+               return NULL;
+       }
+
+       bootstage_mark(BOOTSTAGE_ID_RD_MAGIC);
+       image_print_contents(rd_hdr);
+
+       if (verify) {
+               puts("   Verifying Checksum ... ");
+               if (!image_check_dcrc(rd_hdr)) {
+                       puts("Bad Data CRC\n");
+                       bootstage_error(BOOTSTAGE_ID_RD_CHECKSUM);
+                       return NULL;
+               }
+               puts("OK\n");
+       }
+
+       bootstage_mark(BOOTSTAGE_ID_RD_HDR_CHECKSUM);
+
+       if (!image_check_os(rd_hdr, IH_OS_LINUX) ||
+           !image_check_arch(rd_hdr, arch) ||
+           !image_check_type(rd_hdr, IH_TYPE_RAMDISK)) {
+               printf("No Linux %s Ramdisk Image\n",
+                               genimg_get_arch_name(arch));
+               bootstage_error(BOOTSTAGE_ID_RAMDISK);
+               return NULL;
+       }
+
+       return rd_hdr;
+}
+#endif
+
+/*****************************************************************************/
+/* Shared dual-format routines */
+/*****************************************************************************/
+ulong image_load_addr = CONFIG_SYS_LOAD_ADDR;  /* Default Load Address */
+ulong image_save_addr;                 /* Default Save Address */
+ulong image_save_size;                 /* Default Save Size (in bytes) */
+
+static int on_loadaddr(const char *name, const char *value, enum env_op op,
+       int flags)
+{
+       switch (op) {
+       case env_op_create:
+       case env_op_overwrite:
+               image_load_addr = hextoul(value, NULL);
+               break;
+       default:
+               break;
+       }
+
+       return 0;
+}
+U_BOOT_ENV_CALLBACK(loadaddr, on_loadaddr);
+
+ulong env_get_bootm_low(void)
+{
+       char *s = env_get("bootm_low");
+       if (s) {
+               ulong tmp = hextoul(s, NULL);
+               return tmp;
+       }
+
+#if defined(CONFIG_SYS_SDRAM_BASE)
+       return CONFIG_SYS_SDRAM_BASE;
+#elif defined(CONFIG_ARM) || defined(CONFIG_MICROBLAZE) || defined(CONFIG_RISCV)
+       return gd->bd->bi_dram[0].start;
+#else
+       return 0;
+#endif
+}
+
+phys_size_t env_get_bootm_size(void)
+{
+       phys_size_t tmp, size;
+       phys_addr_t start;
+       char *s = env_get("bootm_size");
+       if (s) {
+               tmp = (phys_size_t)simple_strtoull(s, NULL, 16);
+               return tmp;
+       }
+
+       start = gd->ram_base;
+       size = gd->ram_size;
+
+       if (start + size > gd->ram_top)
+               size = gd->ram_top - start;
+
+       s = env_get("bootm_low");
+       if (s)
+               tmp = (phys_size_t)simple_strtoull(s, NULL, 16);
+       else
+               tmp = start;
+
+       return size - (tmp - start);
+}
+
+phys_size_t env_get_bootm_mapsize(void)
+{
+       phys_size_t tmp;
+       char *s = env_get("bootm_mapsize");
+       if (s) {
+               tmp = (phys_size_t)simple_strtoull(s, NULL, 16);
+               return tmp;
+       }
+
+#if defined(CONFIG_SYS_BOOTMAPSZ)
+       return CONFIG_SYS_BOOTMAPSZ;
+#else
+       return env_get_bootm_size();
+#endif
+}
+
+void memmove_wd(void *to, void *from, size_t len, ulong chunksz)
+{
+       if (to == from)
+               return;
+
+#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
+       if (to > from) {
+               from += len;
+               to += len;
+       }
+       while (len > 0) {
+               size_t tail = (len > chunksz) ? chunksz : len;
+               WATCHDOG_RESET();
+               if (to > from) {
+                       to -= tail;
+                       from -= tail;
+               }
+               memmove(to, from, tail);
+               if (to < from) {
+                       to += tail;
+                       from += tail;
+               }
+               len -= tail;
+       }
+#else  /* !(CONFIG_HW_WATCHDOG || CONFIG_WATCHDOG) */
+       memmove(to, from, len);
+#endif /* CONFIG_HW_WATCHDOG || CONFIG_WATCHDOG */
+}
+
+/**
+ * genimg_get_kernel_addr_fit - get the real kernel address and return 2
+ *                              FIT strings
+ * @img_addr: a string might contain real image address
+ * @fit_uname_config: double pointer to a char, will hold pointer to a
+ *                    configuration unit name
+ * @fit_uname_kernel: double pointer to a char, will hold pointer to a subimage
+ *                    name
+ *
+ * genimg_get_kernel_addr_fit get the real kernel start address from a string
+ * which is normally the first argv of bootm/bootz
+ *
+ * returns:
+ *     kernel start address
+ */
+ulong genimg_get_kernel_addr_fit(char * const img_addr,
+                            const char **fit_uname_config,
+                            const char **fit_uname_kernel)
+{
+       ulong kernel_addr;
+
+       /* find out kernel image address */
+       if (!img_addr) {
+               kernel_addr = image_load_addr;
+               debug("*  kernel: default image load address = 0x%08lx\n",
+                     image_load_addr);
+#if CONFIG_IS_ENABLED(FIT)
+       } else if (fit_parse_conf(img_addr, image_load_addr, &kernel_addr,
+                                 fit_uname_config)) {
+               debug("*  kernel: config '%s' from image at 0x%08lx\n",
+                     *fit_uname_config, kernel_addr);
+       } else if (fit_parse_subimage(img_addr, image_load_addr, &kernel_addr,
+                                    fit_uname_kernel)) {
+               debug("*  kernel: subimage '%s' from image at 0x%08lx\n",
+                     *fit_uname_kernel, kernel_addr);
+#endif
+       } else {
+               kernel_addr = hextoul(img_addr, NULL);
+               debug("*  kernel: cmdline image address = 0x%08lx\n",
+                     kernel_addr);
+       }
+
+       return kernel_addr;
+}
+
+/**
+ * genimg_get_kernel_addr() is the simple version of
+ * genimg_get_kernel_addr_fit(). It ignores those return FIT strings
+ */
+ulong genimg_get_kernel_addr(char * const img_addr)
+{
+       const char *fit_uname_config = NULL;
+       const char *fit_uname_kernel = NULL;
+
+       return genimg_get_kernel_addr_fit(img_addr, &fit_uname_config,
+                                         &fit_uname_kernel);
+}
+
+/**
+ * genimg_get_format - get image format type
+ * @img_addr: image start address
+ *
+ * genimg_get_format() checks whether provided address points to a valid
+ * legacy or FIT image.
+ *
+ * New uImage format and FDT blob are based on a libfdt. FDT blob
+ * may be passed directly or embedded in a FIT image. In both situations
+ * genimg_get_format() must be able to dectect libfdt header.
+ *
+ * returns:
+ *     image format type or IMAGE_FORMAT_INVALID if no image is present
+ */
+int genimg_get_format(const void *img_addr)
+{
+#if CONFIG_IS_ENABLED(LEGACY_IMAGE_FORMAT)
+       const image_header_t *hdr;
+
+       hdr = (const image_header_t *)img_addr;
+       if (image_check_magic(hdr))
+               return IMAGE_FORMAT_LEGACY;
+#endif
+#if IMAGE_ENABLE_FIT || IMAGE_ENABLE_OF_LIBFDT
+       if (fdt_check_header(img_addr) == 0)
+               return IMAGE_FORMAT_FIT;
+#endif
+#ifdef CONFIG_ANDROID_BOOT_IMAGE
+       if (android_image_check_header(img_addr) == 0)
+               return IMAGE_FORMAT_ANDROID;
+#endif
+
+       return IMAGE_FORMAT_INVALID;
+}
+
+/**
+ * fit_has_config - check if there is a valid FIT configuration
+ * @images: pointer to the bootm command headers structure
+ *
+ * fit_has_config() checks if there is a FIT configuration in use
+ * (if FTI support is present).
+ *
+ * returns:
+ *     0, no FIT support or no configuration found
+ *     1, configuration found
+ */
+int genimg_has_config(bootm_headers_t *images)
+{
+#if IMAGE_ENABLE_FIT
+       if (images->fit_uname_cfg)
+               return 1;
+#endif
+       return 0;
+}
+
+/**
+ * boot_get_ramdisk - main ramdisk handling routine
+ * @argc: command argument count
+ * @argv: command argument list
+ * @images: pointer to the bootm images structure
+ * @arch: expected ramdisk architecture
+ * @rd_start: pointer to a ulong variable, will hold ramdisk start address
+ * @rd_end: pointer to a ulong variable, will hold ramdisk end
+ *
+ * boot_get_ramdisk() is responsible for finding a valid ramdisk image.
+ * Curently supported are the following ramdisk sources:
+ *      - multicomponent kernel/ramdisk image,
+ *      - commandline provided address of decicated ramdisk image.
+ *
+ * returns:
+ *     0, if ramdisk image was found and valid, or skiped
+ *     rd_start and rd_end are set to ramdisk start/end addresses if
+ *     ramdisk image is found and valid
+ *
+ *     1, if ramdisk image is found but corrupted, or invalid
+ *     rd_start and rd_end are set to 0 if no ramdisk exists
+ */
+int boot_get_ramdisk(int argc, char *const argv[], bootm_headers_t *images,
+                    uint8_t arch, ulong *rd_start, ulong *rd_end)
+{
+       ulong rd_addr, rd_load;
+       ulong rd_data, rd_len;
+#if CONFIG_IS_ENABLED(LEGACY_IMAGE_FORMAT)
+       const image_header_t *rd_hdr;
+#endif
+       void *buf;
+#ifdef CONFIG_SUPPORT_RAW_INITRD
+       char *end;
+#endif
+#if IMAGE_ENABLE_FIT
+       const char      *fit_uname_config = images->fit_uname_cfg;
+       const char      *fit_uname_ramdisk = NULL;
+       ulong           default_addr;
+       int             rd_noffset;
+#endif
+       const char *select = NULL;
+
+       *rd_start = 0;
+       *rd_end = 0;
+
+#ifdef CONFIG_ANDROID_BOOT_IMAGE
+       /*
+        * Look for an Android boot image.
+        */
+       buf = map_sysmem(images->os.start, 0);
+       if (buf && genimg_get_format(buf) == IMAGE_FORMAT_ANDROID)
+               select = (argc == 0) ? env_get("loadaddr") : argv[0];
+#endif
+
+       if (argc >= 2)
+               select = argv[1];
+
+       /*
+        * Look for a '-' which indicates to ignore the
+        * ramdisk argument
+        */
+       if (select && strcmp(select, "-") ==  0) {
+               debug("## Skipping init Ramdisk\n");
+               rd_len = rd_data = 0;
+       } else if (select || genimg_has_config(images)) {
+#if IMAGE_ENABLE_FIT
+               if (select) {
+                       /*
+                        * If the init ramdisk comes from the FIT image and
+                        * the FIT image address is omitted in the command
+                        * line argument, try to use os FIT image address or
+                        * default load address.
+                        */
+                       if (images->fit_uname_os)
+                               default_addr = (ulong)images->fit_hdr_os;
+                       else
+                               default_addr = image_load_addr;
+
+                       if (fit_parse_conf(select, default_addr,
+                                          &rd_addr, &fit_uname_config)) {
+                               debug("*  ramdisk: config '%s' from image at "
+                                               "0x%08lx\n",
+                                               fit_uname_config, rd_addr);
+                       } else if (fit_parse_subimage(select, default_addr,
+                                               &rd_addr, &fit_uname_ramdisk)) {
+                               debug("*  ramdisk: subimage '%s' from image at "
+                                               "0x%08lx\n",
+                                               fit_uname_ramdisk, rd_addr);
+                       } else
+#endif
+                       {
+                               rd_addr = hextoul(select, NULL);
+                               debug("*  ramdisk: cmdline image address = "
+                                               "0x%08lx\n",
+                                               rd_addr);
+                       }
+#if IMAGE_ENABLE_FIT
+               } else {
+                       /* use FIT configuration provided in first bootm
+                        * command argument. If the property is not defined,
+                        * quit silently.
+                        */
+                       rd_addr = map_to_sysmem(images->fit_hdr_os);
+                       rd_noffset = fit_get_node_from_config(images,
+                                       FIT_RAMDISK_PROP, rd_addr);
+                       if (rd_noffset == -ENOENT)
+                               return 0;
+                       else if (rd_noffset < 0)
+                               return 1;
+               }
+#endif
+
+               /*
+                * Check if there is an initrd image at the
+                * address provided in the second bootm argument
+                * check image type, for FIT images get FIT node.
+                */
+               buf = map_sysmem(rd_addr, 0);
+               switch (genimg_get_format(buf)) {
+#if CONFIG_IS_ENABLED(LEGACY_IMAGE_FORMAT)
+               case IMAGE_FORMAT_LEGACY:
+                       printf("## Loading init Ramdisk from Legacy "
+                                       "Image at %08lx ...\n", rd_addr);
+
+                       bootstage_mark(BOOTSTAGE_ID_CHECK_RAMDISK);
+                       rd_hdr = image_get_ramdisk(rd_addr, arch,
+                                                       images->verify);
+
+                       if (rd_hdr == NULL)
+                               return 1;
+
+                       rd_data = image_get_data(rd_hdr);
+                       rd_len = image_get_data_size(rd_hdr);
+                       rd_load = image_get_load(rd_hdr);
+                       break;
+#endif
+#if IMAGE_ENABLE_FIT
+               case IMAGE_FORMAT_FIT:
+                       rd_noffset = fit_image_load(images,
+                                       rd_addr, &fit_uname_ramdisk,
+                                       &fit_uname_config, arch,
+                                       IH_TYPE_RAMDISK,
+                                       BOOTSTAGE_ID_FIT_RD_START,
+                                       FIT_LOAD_OPTIONAL_NON_ZERO,
+                                       &rd_data, &rd_len);
+                       if (rd_noffset < 0)
+                               return 1;
+
+                       images->fit_hdr_rd = map_sysmem(rd_addr, 0);
+                       images->fit_uname_rd = fit_uname_ramdisk;
+                       images->fit_noffset_rd = rd_noffset;
+                       break;
+#endif
+#ifdef CONFIG_ANDROID_BOOT_IMAGE
+               case IMAGE_FORMAT_ANDROID:
+                       android_image_get_ramdisk((void *)images->os.start,
+                               &rd_data, &rd_len);
+                       break;
+#endif
+               default:
+#ifdef CONFIG_SUPPORT_RAW_INITRD
+                       end = NULL;
+                       if (select)
+                               end = strchr(select, ':');
+                       if (end) {
+                               rd_len = hextoul(++end, NULL);
+                               rd_data = rd_addr;
+                       } else
+#endif
+                       {
+                               puts("Wrong Ramdisk Image Format\n");
+                               rd_data = rd_len = rd_load = 0;
+                               return 1;
+                       }
+               }
+       } else if (images->legacy_hdr_valid &&
+                       image_check_type(&images->legacy_hdr_os_copy,
+                                               IH_TYPE_MULTI)) {
+
+               /*
+                * Now check if we have a legacy mult-component image,
+                * get second entry data start address and len.
+                */
+               bootstage_mark(BOOTSTAGE_ID_RAMDISK);
+               printf("## Loading init Ramdisk from multi component "
+                               "Legacy Image at %08lx ...\n",
+                               (ulong)images->legacy_hdr_os);
+
+               image_multi_getimg(images->legacy_hdr_os, 1, &rd_data, &rd_len);
+       } else {
+               /*
+                * no initrd image
+                */
+               bootstage_mark(BOOTSTAGE_ID_NO_RAMDISK);
+               rd_len = rd_data = 0;
+       }
+
+       if (!rd_data) {
+               debug("## No init Ramdisk\n");
+       } else {
+               *rd_start = rd_data;
+               *rd_end = rd_data + rd_len;
+       }
+       debug("   ramdisk start = 0x%08lx, ramdisk end = 0x%08lx\n",
+                       *rd_start, *rd_end);
+
+       return 0;
+}
+
+#ifdef CONFIG_SYS_BOOT_RAMDISK_HIGH
+/**
+ * boot_ramdisk_high - relocate init ramdisk
+ * @lmb: pointer to lmb handle, will be used for memory mgmt
+ * @rd_data: ramdisk data start address
+ * @rd_len: ramdisk data length
+ * @initrd_start: pointer to a ulong variable, will hold final init ramdisk
+ *      start address (after possible relocation)
+ * @initrd_end: pointer to a ulong variable, will hold final init ramdisk
+ *      end address (after possible relocation)
+ *
+ * boot_ramdisk_high() takes a relocation hint from "initrd_high" environment
+ * variable and if requested ramdisk data is moved to a specified location.
+ *
+ * Initrd_start and initrd_end are set to final (after relocation) ramdisk
+ * start/end addresses if ramdisk image start and len were provided,
+ * otherwise set initrd_start and initrd_end set to zeros.
+ *
+ * returns:
+ *      0 - success
+ *     -1 - failure
+ */
+int boot_ramdisk_high(struct lmb *lmb, ulong rd_data, ulong rd_len,
+                 ulong *initrd_start, ulong *initrd_end)
+{
+       char    *s;
+       ulong   initrd_high;
+       int     initrd_copy_to_ram = 1;
+
+       s = env_get("initrd_high");
+       if (s) {
+               /* a value of "no" or a similar string will act like 0,
+                * turning the "load high" feature off. This is intentional.
+                */
+               initrd_high = hextoul(s, NULL);
+               if (initrd_high == ~0)
+                       initrd_copy_to_ram = 0;
+       } else {
+               initrd_high = env_get_bootm_mapsize() + env_get_bootm_low();
+       }
+
+
+       debug("## initrd_high = 0x%08lx, copy_to_ram = %d\n",
+                       initrd_high, initrd_copy_to_ram);
+
+       if (rd_data) {
+               if (!initrd_copy_to_ram) {      /* zero-copy ramdisk support */
+                       debug("   in-place initrd\n");
+                       *initrd_start = rd_data;
+                       *initrd_end = rd_data + rd_len;
+                       lmb_reserve(lmb, rd_data, rd_len);
+               } else {
+                       if (initrd_high)
+                               *initrd_start = (ulong)lmb_alloc_base(lmb,
+                                               rd_len, 0x1000, initrd_high);
+                       else
+                               *initrd_start = (ulong)lmb_alloc(lmb, rd_len,
+                                                                0x1000);
+
+                       if (*initrd_start == 0) {
+                               puts("ramdisk - allocation error\n");
+                               goto error;
+                       }
+                       bootstage_mark(BOOTSTAGE_ID_COPY_RAMDISK);
+
+                       *initrd_end = *initrd_start + rd_len;
+                       printf("   Loading Ramdisk to %08lx, end %08lx ... ",
+                                       *initrd_start, *initrd_end);
+
+                       memmove_wd((void *)*initrd_start,
+                                       (void *)rd_data, rd_len, CHUNKSZ);
+
+#ifdef CONFIG_MP
+                       /*
+                        * Ensure the image is flushed to memory to handle
+                        * AMP boot scenarios in which we might not be
+                        * HW cache coherent
+                        */
+                       flush_cache((unsigned long)*initrd_start,
+                                   ALIGN(rd_len, ARCH_DMA_MINALIGN));
+#endif
+                       puts("OK\n");
+               }
+       } else {
+               *initrd_start = 0;
+               *initrd_end = 0;
+       }
+       debug("   ramdisk load start = 0x%08lx, ramdisk load end = 0x%08lx\n",
+                       *initrd_start, *initrd_end);
+
+       return 0;
+
+error:
+       return -1;
+}
+#endif /* CONFIG_SYS_BOOT_RAMDISK_HIGH */
+
+int boot_get_setup(bootm_headers_t *images, uint8_t arch,
+                  ulong *setup_start, ulong *setup_len)
+{
+#if IMAGE_ENABLE_FIT
+       return boot_get_setup_fit(images, arch, setup_start, setup_len);
+#else
+       return -ENOENT;
+#endif
+}
+
+#if IMAGE_ENABLE_FIT
+#if defined(CONFIG_FPGA)
+int boot_get_fpga(int argc, char *const argv[], bootm_headers_t *images,
+                 uint8_t arch, const ulong *ld_start, ulong * const ld_len)
+{
+       ulong tmp_img_addr, img_data, img_len;
+       void *buf;
+       int conf_noffset;
+       int fit_img_result;
+       const char *uname, *name;
+       int err;
+       int devnum = 0; /* TODO support multi fpga platforms */
+
+       /* Check to see if the images struct has a FIT configuration */
+       if (!genimg_has_config(images)) {
+               debug("## FIT configuration was not specified\n");
+               return 0;
+       }
+
+       /*
+        * Obtain the os FIT header from the images struct
+        */
+       tmp_img_addr = map_to_sysmem(images->fit_hdr_os);
+       buf = map_sysmem(tmp_img_addr, 0);
+       /*
+        * Check image type. For FIT images get FIT node
+        * and attempt to locate a generic binary.
+        */
+       switch (genimg_get_format(buf)) {
+       case IMAGE_FORMAT_FIT:
+               conf_noffset = fit_conf_get_node(buf, images->fit_uname_cfg);
+
+               uname = fdt_stringlist_get(buf, conf_noffset, FIT_FPGA_PROP, 0,
+                                          NULL);
+               if (!uname) {
+                       debug("## FPGA image is not specified\n");
+                       return 0;
+               }
+               fit_img_result = fit_image_load(images,
+                                               tmp_img_addr,
+                                               (const char **)&uname,
+                                               &(images->fit_uname_cfg),
+                                               arch,
+                                               IH_TYPE_FPGA,
+                                               BOOTSTAGE_ID_FPGA_INIT,
+                                               FIT_LOAD_OPTIONAL_NON_ZERO,
+                                               &img_data, &img_len);
+
+               debug("FPGA image (%s) loaded to 0x%lx/size 0x%lx\n",
+                     uname, img_data, img_len);
+
+               if (fit_img_result < 0) {
+                       /* Something went wrong! */
+                       return fit_img_result;
+               }
+
+               if (!fpga_is_partial_data(devnum, img_len)) {
+                       name = "full";
+                       err = fpga_loadbitstream(devnum, (char *)img_data,
+                                                img_len, BIT_FULL);
+                       if (err)
+                               err = fpga_load(devnum, (const void *)img_data,
+                                               img_len, BIT_FULL);
+               } else {
+                       name = "partial";
+                       err = fpga_loadbitstream(devnum, (char *)img_data,
+                                                img_len, BIT_PARTIAL);
+                       if (err)
+                               err = fpga_load(devnum, (const void *)img_data,
+                                               img_len, BIT_PARTIAL);
+               }
+
+               if (err)
+                       return err;
+
+               printf("   Programming %s bitstream... OK\n", name);
+               break;
+       default:
+               printf("The given image format is not supported (corrupt?)\n");
+               return 1;
+       }
+
+       return 0;
+}
+#endif
+
+static void fit_loadable_process(uint8_t img_type,
+                                ulong img_data,
+                                ulong img_len)
+{
+       int i;
+       const unsigned int count =
+                       ll_entry_count(struct fit_loadable_tbl, fit_loadable);
+       struct fit_loadable_tbl *fit_loadable_handler =
+                       ll_entry_start(struct fit_loadable_tbl, fit_loadable);
+       /* For each loadable handler */
+       for (i = 0; i < count; i++, fit_loadable_handler++)
+               /* matching this type */
+               if (fit_loadable_handler->type == img_type)
+                       /* call that handler with this image data */
+                       fit_loadable_handler->handler(img_data, img_len);
+}
+
+int boot_get_loadable(int argc, char *const argv[], bootm_headers_t *images,
+                     uint8_t arch, const ulong *ld_start, ulong * const ld_len)
+{
+       /*
+        * These variables are used to hold the current image location
+        * in system memory.
+        */
+       ulong tmp_img_addr;
+       /*
+        * These two variables are requirements for fit_image_load, but
+        * their values are not used
+        */
+       ulong img_data, img_len;
+       void *buf;
+       int loadables_index;
+       int conf_noffset;
+       int fit_img_result;
+       const char *uname;
+       uint8_t img_type;
+
+       /* Check to see if the images struct has a FIT configuration */
+       if (!genimg_has_config(images)) {
+               debug("## FIT configuration was not specified\n");
+               return 0;
+       }
+
+       /*
+        * Obtain the os FIT header from the images struct
+        */
+       tmp_img_addr = map_to_sysmem(images->fit_hdr_os);
+       buf = map_sysmem(tmp_img_addr, 0);
+       /*
+        * Check image type. For FIT images get FIT node
+        * and attempt to locate a generic binary.
+        */
+       switch (genimg_get_format(buf)) {
+       case IMAGE_FORMAT_FIT:
+               conf_noffset = fit_conf_get_node(buf, images->fit_uname_cfg);
+
+               for (loadables_index = 0;
+                    uname = fdt_stringlist_get(buf, conf_noffset,
+                                       FIT_LOADABLE_PROP, loadables_index,
+                                       NULL), uname;
+                    loadables_index++)
+               {
+                       fit_img_result = fit_image_load(images,
+                               tmp_img_addr,
+                               &uname,
+                               &(images->fit_uname_cfg), arch,
+                               IH_TYPE_LOADABLE,
+                               BOOTSTAGE_ID_FIT_LOADABLE_START,
+                               FIT_LOAD_OPTIONAL_NON_ZERO,
+                               &img_data, &img_len);
+                       if (fit_img_result < 0) {
+                               /* Something went wrong! */
+                               return fit_img_result;
+                       }
+
+                       fit_img_result = fit_image_get_node(buf, uname);
+                       if (fit_img_result < 0) {
+                               /* Something went wrong! */
+                               return fit_img_result;
+                       }
+                       fit_img_result = fit_image_get_type(buf,
+                                                           fit_img_result,
+                                                           &img_type);
+                       if (fit_img_result < 0) {
+                               /* Something went wrong! */
+                               return fit_img_result;
+                       }
+
+                       fit_loadable_process(img_type, img_data, img_len);
+               }
+               break;
+       default:
+               printf("The given image format is not supported (corrupt?)\n");
+               return 1;
+       }
+
+       return 0;
+}
+#endif
+
+#ifdef CONFIG_SYS_BOOT_GET_CMDLINE
+/**
+ * boot_get_cmdline - allocate and initialize kernel cmdline
+ * @lmb: pointer to lmb handle, will be used for memory mgmt
+ * @cmd_start: pointer to a ulong variable, will hold cmdline start
+ * @cmd_end: pointer to a ulong variable, will hold cmdline end
+ *
+ * boot_get_cmdline() allocates space for kernel command line below
+ * BOOTMAPSZ + env_get_bootm_low() address. If "bootargs" U-Boot environment
+ * variable is present its contents is copied to allocated kernel
+ * command line.
+ *
+ * returns:
+ *      0 - success
+ *     -1 - failure
+ */
+int boot_get_cmdline(struct lmb *lmb, ulong *cmd_start, ulong *cmd_end)
+{
+       char *cmdline;
+       char *s;
+
+       cmdline = (char *)(ulong)lmb_alloc_base(lmb, CONFIG_SYS_BARGSIZE, 0xf,
+                               env_get_bootm_mapsize() + env_get_bootm_low());
+
+       if (cmdline == NULL)
+               return -1;
+
+       s = env_get("bootargs");
+       if (!s)
+               s = "";
+
+       strcpy(cmdline, s);
+
+       *cmd_start = (ulong) & cmdline[0];
+       *cmd_end = *cmd_start + strlen(cmdline);
+
+       debug("## cmdline at 0x%08lx ... 0x%08lx\n", *cmd_start, *cmd_end);
+
+       return 0;
+}
+#endif /* CONFIG_SYS_BOOT_GET_CMDLINE */
+
+#ifdef CONFIG_SYS_BOOT_GET_KBD
+/**
+ * boot_get_kbd - allocate and initialize kernel copy of board info
+ * @lmb: pointer to lmb handle, will be used for memory mgmt
+ * @kbd: double pointer to board info data
+ *
+ * boot_get_kbd() allocates space for kernel copy of board info data below
+ * BOOTMAPSZ + env_get_bootm_low() address and kernel board info is initialized
+ * with the current u-boot board info data.
+ *
+ * returns:
+ *      0 - success
+ *     -1 - failure
+ */
+int boot_get_kbd(struct lmb *lmb, struct bd_info **kbd)
+{
+       *kbd = (struct bd_info *)(ulong)lmb_alloc_base(lmb,
+                                                      sizeof(struct bd_info),
+                                                      0xf,
+                                                      env_get_bootm_mapsize() + env_get_bootm_low());
+       if (*kbd == NULL)
+               return -1;
+
+       **kbd = *(gd->bd);
+
+       debug("## kernel board info at 0x%08lx\n", (ulong)*kbd);
+
+#if defined(DEBUG) && defined(CONFIG_CMD_BDI)
+       do_bdinfo(NULL, 0, 0, NULL);
+#endif
+
+       return 0;
+}
+#endif /* CONFIG_SYS_BOOT_GET_KBD */
+
+#ifdef CONFIG_LMB
+int image_setup_linux(bootm_headers_t *images)
+{
+       ulong of_size = images->ft_len;
+       char **of_flat_tree = &images->ft_addr;
+       struct lmb *lmb = &images->lmb;
+       int ret;
+
+       if (IMAGE_ENABLE_OF_LIBFDT)
+               boot_fdt_add_mem_rsv_regions(lmb, *of_flat_tree);
+
+       if (IMAGE_BOOT_GET_CMDLINE) {
+               ret = boot_get_cmdline(lmb, &images->cmdline_start,
+                               &images->cmdline_end);
+               if (ret) {
+                       puts("ERROR with allocation of cmdline\n");
+                       return ret;
+               }
+       }
+
+       if (IMAGE_ENABLE_OF_LIBFDT) {
+               ret = boot_relocate_fdt(lmb, of_flat_tree, &of_size);
+               if (ret)
+                       return ret;
+       }
+
+       if (IMAGE_ENABLE_OF_LIBFDT && of_size) {
+               ret = image_setup_libfdt(images, *of_flat_tree, of_size, lmb);
+               if (ret)
+                       return ret;
+       }
+
+       return 0;
+}
+#endif /* CONFIG_LMB */
index e16d433..ed7f188 100644 (file)
@@ -8,15 +8,11 @@
 
 #ifndef USE_HOSTCC
 #include <common.h>
-#include <bootstage.h>
-#include <cpu_func.h>
 #include <env.h>
 #include <lmb.h>
 #include <log.h>
 #include <malloc.h>
-#include <asm/cache.h>
 #include <u-boot/crc.h>
-#include <watchdog.h>
 
 #ifdef CONFIG_SHOW_BOOT_PROGRESS
 #include <status_led.h>
 
 #include <rtc.h>
 
-#include <image.h>
-#include <mapmem.h>
-
 #if IMAGE_ENABLE_FIT || IMAGE_ENABLE_OF_LIBFDT
 #include <linux/libfdt.h>
 #include <fdt_support.h>
-#include <fpga.h>
-#include <xilinx.h>
 #endif
 
 #include <asm/global_data.h>
@@ -47,11 +38,6 @@ extern int do_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc,
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#if CONFIG_IS_ENABLED(LEGACY_IMAGE_FORMAT)
-static const image_header_t *image_get_ramdisk(ulong rd_addr, uint8_t arch,
-                                               int verify);
-#endif
-
 /* Set this if we have less than 4 MB of malloc() space */
 #if CONFIG_SYS_MALLOC_LEN < (4096 * 1024)
 #define CONSERVE_MEMORY                true
@@ -63,7 +49,6 @@ static const image_header_t *image_get_ramdisk(ulong rd_addr, uint8_t arch,
 #include "mkimage.h"
 #include <u-boot/md5.h>
 #include <time.h>
-#include <image.h>
 
 #ifndef __maybe_unused
 # define __maybe_unused                /* unimplemented */
@@ -76,6 +61,7 @@ static const image_header_t *image_get_ramdisk(ulong rd_addr, uint8_t arch,
 #include <abuf.h>
 #include <bzlib.h>
 #include <gzip.h>
+#include <image.h>
 #include <lz4.h>
 #include <imximage.h>
 #include <linux/lzo.h>
@@ -86,10 +72,6 @@ static const image_header_t *image_get_ramdisk(ulong rd_addr, uint8_t arch,
 #include <lzma/LzmaTools.h>
 #include <u-boot/crc.h>
 
-#ifndef CONFIG_SYS_BARGSIZE
-#define CONFIG_SYS_BARGSIZE 512
-#endif
-
 static const table_entry_t uimage_arch[] = {
        {       IH_ARCH_INVALID,        "invalid",      "Invalid ARCH", },
        {       IH_ARCH_ALPHA,          "alpha",        "Alpha",        },
@@ -546,180 +528,7 @@ int image_decomp(int comp, ulong load, ulong image_start, int type,
        return 0;
 }
 
-#ifndef USE_HOSTCC
-#if CONFIG_IS_ENABLED(LEGACY_IMAGE_FORMAT)
-/**
- * image_get_ramdisk - get and verify ramdisk image
- * @rd_addr: ramdisk image start address
- * @arch: expected ramdisk architecture
- * @verify: checksum verification flag
- *
- * image_get_ramdisk() returns a pointer to the verified ramdisk image
- * header. Routine receives image start address and expected architecture
- * flag. Verification done covers data and header integrity and os/type/arch
- * fields checking.
- *
- * returns:
- *     pointer to a ramdisk image header, if image was found and valid
- *     otherwise, return NULL
- */
-static const image_header_t *image_get_ramdisk(ulong rd_addr, uint8_t arch,
-                                               int verify)
-{
-       const image_header_t *rd_hdr = (const image_header_t *)rd_addr;
-
-       if (!image_check_magic(rd_hdr)) {
-               puts("Bad Magic Number\n");
-               bootstage_error(BOOTSTAGE_ID_RD_MAGIC);
-               return NULL;
-       }
-
-       if (!image_check_hcrc(rd_hdr)) {
-               puts("Bad Header Checksum\n");
-               bootstage_error(BOOTSTAGE_ID_RD_HDR_CHECKSUM);
-               return NULL;
-       }
-
-       bootstage_mark(BOOTSTAGE_ID_RD_MAGIC);
-       image_print_contents(rd_hdr);
-
-       if (verify) {
-               puts("   Verifying Checksum ... ");
-               if (!image_check_dcrc(rd_hdr)) {
-                       puts("Bad Data CRC\n");
-                       bootstage_error(BOOTSTAGE_ID_RD_CHECKSUM);
-                       return NULL;
-               }
-               puts("OK\n");
-       }
-
-       bootstage_mark(BOOTSTAGE_ID_RD_HDR_CHECKSUM);
-
-       if (!image_check_os(rd_hdr, IH_OS_LINUX) ||
-           !image_check_arch(rd_hdr, arch) ||
-           !image_check_type(rd_hdr, IH_TYPE_RAMDISK)) {
-               printf("No Linux %s Ramdisk Image\n",
-                               genimg_get_arch_name(arch));
-               bootstage_error(BOOTSTAGE_ID_RAMDISK);
-               return NULL;
-       }
-
-       return rd_hdr;
-}
-#endif
-#endif /* !USE_HOSTCC */
-
-/*****************************************************************************/
-/* Shared dual-format routines */
-/*****************************************************************************/
-#ifndef USE_HOSTCC
-ulong image_load_addr = CONFIG_SYS_LOAD_ADDR;  /* Default Load Address */
-ulong image_save_addr;                 /* Default Save Address */
-ulong image_save_size;                 /* Default Save Size (in bytes) */
-
-static int on_loadaddr(const char *name, const char *value, enum env_op op,
-       int flags)
-{
-       switch (op) {
-       case env_op_create:
-       case env_op_overwrite:
-               image_load_addr = hextoul(value, NULL);
-               break;
-       default:
-               break;
-       }
-
-       return 0;
-}
-U_BOOT_ENV_CALLBACK(loadaddr, on_loadaddr);
-
-ulong env_get_bootm_low(void)
-{
-       char *s = env_get("bootm_low");
-       if (s) {
-               ulong tmp = hextoul(s, NULL);
-               return tmp;
-       }
-
-#if defined(CONFIG_SYS_SDRAM_BASE)
-       return CONFIG_SYS_SDRAM_BASE;
-#elif defined(CONFIG_ARM) || defined(CONFIG_MICROBLAZE) || defined(CONFIG_RISCV)
-       return gd->bd->bi_dram[0].start;
-#else
-       return 0;
-#endif
-}
-
-phys_size_t env_get_bootm_size(void)
-{
-       phys_size_t tmp, size;
-       phys_addr_t start;
-       char *s = env_get("bootm_size");
-       if (s) {
-               tmp = (phys_size_t)simple_strtoull(s, NULL, 16);
-               return tmp;
-       }
-
-       start = gd->ram_base;
-       size = gd->ram_size;
-
-       if (start + size > gd->ram_top)
-               size = gd->ram_top - start;
-
-       s = env_get("bootm_low");
-       if (s)
-               tmp = (phys_size_t)simple_strtoull(s, NULL, 16);
-       else
-               tmp = start;
-
-       return size - (tmp - start);
-}
-
-phys_size_t env_get_bootm_mapsize(void)
-{
-       phys_size_t tmp;
-       char *s = env_get("bootm_mapsize");
-       if (s) {
-               tmp = (phys_size_t)simple_strtoull(s, NULL, 16);
-               return tmp;
-       }
-
-#if defined(CONFIG_SYS_BOOTMAPSZ)
-       return CONFIG_SYS_BOOTMAPSZ;
-#else
-       return env_get_bootm_size();
-#endif
-}
-
-void memmove_wd(void *to, void *from, size_t len, ulong chunksz)
-{
-       if (to == from)
-               return;
-
-#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
-       if (to > from) {
-               from += len;
-               to += len;
-       }
-       while (len > 0) {
-               size_t tail = (len > chunksz) ? chunksz : len;
-               WATCHDOG_RESET();
-               if (to > from) {
-                       to -= tail;
-                       from -= tail;
-               }
-               memmove(to, from, tail);
-               if (to < from) {
-                       to += tail;
-                       from += tail;
-               }
-               len -= tail;
-       }
-#else  /* !(CONFIG_HW_WATCHDOG || CONFIG_WATCHDOG) */
-       memmove(to, from, len);
-#endif /* CONFIG_HW_WATCHDOG || CONFIG_WATCHDOG */
-}
-#else  /* USE_HOSTCC */
+#ifdef USE_HOSTCC
 void memmove_wd(void *to, void *from, size_t len, ulong chunksz)
 {
        memmove(to, from, len);
@@ -982,733 +791,3 @@ int genimg_get_comp_id(const char *name)
 {
        return (get_table_entry_id(uimage_comp, "Compression", name));
 }
-
-#ifndef USE_HOSTCC
-/**
- * genimg_get_kernel_addr_fit - get the real kernel address and return 2
- *                              FIT strings
- * @img_addr: a string might contain real image address
- * @fit_uname_config: double pointer to a char, will hold pointer to a
- *                    configuration unit name
- * @fit_uname_kernel: double pointer to a char, will hold pointer to a subimage
- *                    name
- *
- * genimg_get_kernel_addr_fit get the real kernel start address from a string
- * which is normally the first argv of bootm/bootz
- *
- * returns:
- *     kernel start address
- */
-ulong genimg_get_kernel_addr_fit(char * const img_addr,
-                            const char **fit_uname_config,
-                            const char **fit_uname_kernel)
-{
-       ulong kernel_addr;
-
-       /* find out kernel image address */
-       if (!img_addr) {
-               kernel_addr = image_load_addr;
-               debug("*  kernel: default image load address = 0x%08lx\n",
-                     image_load_addr);
-#if CONFIG_IS_ENABLED(FIT)
-       } else if (fit_parse_conf(img_addr, image_load_addr, &kernel_addr,
-                                 fit_uname_config)) {
-               debug("*  kernel: config '%s' from image at 0x%08lx\n",
-                     *fit_uname_config, kernel_addr);
-       } else if (fit_parse_subimage(img_addr, image_load_addr, &kernel_addr,
-                                    fit_uname_kernel)) {
-               debug("*  kernel: subimage '%s' from image at 0x%08lx\n",
-                     *fit_uname_kernel, kernel_addr);
-#endif
-       } else {
-               kernel_addr = hextoul(img_addr, NULL);
-               debug("*  kernel: cmdline image address = 0x%08lx\n",
-                     kernel_addr);
-       }
-
-       return kernel_addr;
-}
-
-/**
- * genimg_get_kernel_addr() is the simple version of
- * genimg_get_kernel_addr_fit(). It ignores those return FIT strings
- */
-ulong genimg_get_kernel_addr(char * const img_addr)
-{
-       const char *fit_uname_config = NULL;
-       const char *fit_uname_kernel = NULL;
-
-       return genimg_get_kernel_addr_fit(img_addr, &fit_uname_config,
-                                         &fit_uname_kernel);
-}
-
-/**
- * genimg_get_format - get image format type
- * @img_addr: image start address
- *
- * genimg_get_format() checks whether provided address points to a valid
- * legacy or FIT image.
- *
- * New uImage format and FDT blob are based on a libfdt. FDT blob
- * may be passed directly or embedded in a FIT image. In both situations
- * genimg_get_format() must be able to dectect libfdt header.
- *
- * returns:
- *     image format type or IMAGE_FORMAT_INVALID if no image is present
- */
-int genimg_get_format(const void *img_addr)
-{
-#if CONFIG_IS_ENABLED(LEGACY_IMAGE_FORMAT)
-       const image_header_t *hdr;
-
-       hdr = (const image_header_t *)img_addr;
-       if (image_check_magic(hdr))
-               return IMAGE_FORMAT_LEGACY;
-#endif
-#if IMAGE_ENABLE_FIT || IMAGE_ENABLE_OF_LIBFDT
-       if (fdt_check_header(img_addr) == 0)
-               return IMAGE_FORMAT_FIT;
-#endif
-#ifdef CONFIG_ANDROID_BOOT_IMAGE
-       if (android_image_check_header(img_addr) == 0)
-               return IMAGE_FORMAT_ANDROID;
-#endif
-
-       return IMAGE_FORMAT_INVALID;
-}
-
-/**
- * fit_has_config - check if there is a valid FIT configuration
- * @images: pointer to the bootm command headers structure
- *
- * fit_has_config() checks if there is a FIT configuration in use
- * (if FTI support is present).
- *
- * returns:
- *     0, no FIT support or no configuration found
- *     1, configuration found
- */
-int genimg_has_config(bootm_headers_t *images)
-{
-#if IMAGE_ENABLE_FIT
-       if (images->fit_uname_cfg)
-               return 1;
-#endif
-       return 0;
-}
-
-/**
- * boot_get_ramdisk - main ramdisk handling routine
- * @argc: command argument count
- * @argv: command argument list
- * @images: pointer to the bootm images structure
- * @arch: expected ramdisk architecture
- * @rd_start: pointer to a ulong variable, will hold ramdisk start address
- * @rd_end: pointer to a ulong variable, will hold ramdisk end
- *
- * boot_get_ramdisk() is responsible for finding a valid ramdisk image.
- * Curently supported are the following ramdisk sources:
- *      - multicomponent kernel/ramdisk image,
- *      - commandline provided address of decicated ramdisk image.
- *
- * returns:
- *     0, if ramdisk image was found and valid, or skiped
- *     rd_start and rd_end are set to ramdisk start/end addresses if
- *     ramdisk image is found and valid
- *
- *     1, if ramdisk image is found but corrupted, or invalid
- *     rd_start and rd_end are set to 0 if no ramdisk exists
- */
-int boot_get_ramdisk(int argc, char *const argv[], bootm_headers_t *images,
-                    uint8_t arch, ulong *rd_start, ulong *rd_end)
-{
-       ulong rd_addr, rd_load;
-       ulong rd_data, rd_len;
-#if CONFIG_IS_ENABLED(LEGACY_IMAGE_FORMAT)
-       const image_header_t *rd_hdr;
-#endif
-       void *buf;
-#ifdef CONFIG_SUPPORT_RAW_INITRD
-       char *end;
-#endif
-#if IMAGE_ENABLE_FIT
-       const char      *fit_uname_config = images->fit_uname_cfg;
-       const char      *fit_uname_ramdisk = NULL;
-       ulong           default_addr;
-       int             rd_noffset;
-#endif
-       const char *select = NULL;
-
-       *rd_start = 0;
-       *rd_end = 0;
-
-#ifdef CONFIG_ANDROID_BOOT_IMAGE
-       /*
-        * Look for an Android boot image.
-        */
-       buf = map_sysmem(images->os.start, 0);
-       if (buf && genimg_get_format(buf) == IMAGE_FORMAT_ANDROID)
-               select = (argc == 0) ? env_get("loadaddr") : argv[0];
-#endif
-
-       if (argc >= 2)
-               select = argv[1];
-
-       /*
-        * Look for a '-' which indicates to ignore the
-        * ramdisk argument
-        */
-       if (select && strcmp(select, "-") ==  0) {
-               debug("## Skipping init Ramdisk\n");
-               rd_len = rd_data = 0;
-       } else if (select || genimg_has_config(images)) {
-#if IMAGE_ENABLE_FIT
-               if (select) {
-                       /*
-                        * If the init ramdisk comes from the FIT image and
-                        * the FIT image address is omitted in the command
-                        * line argument, try to use os FIT image address or
-                        * default load address.
-                        */
-                       if (images->fit_uname_os)
-                               default_addr = (ulong)images->fit_hdr_os;
-                       else
-                               default_addr = image_load_addr;
-
-                       if (fit_parse_conf(select, default_addr,
-                                          &rd_addr, &fit_uname_config)) {
-                               debug("*  ramdisk: config '%s' from image at "
-                                               "0x%08lx\n",
-                                               fit_uname_config, rd_addr);
-                       } else if (fit_parse_subimage(select, default_addr,
-                                               &rd_addr, &fit_uname_ramdisk)) {
-                               debug("*  ramdisk: subimage '%s' from image at "
-                                               "0x%08lx\n",
-                                               fit_uname_ramdisk, rd_addr);
-                       } else
-#endif
-                       {
-                               rd_addr = hextoul(select, NULL);
-                               debug("*  ramdisk: cmdline image address = "
-                                               "0x%08lx\n",
-                                               rd_addr);
-                       }
-#if IMAGE_ENABLE_FIT
-               } else {
-                       /* use FIT configuration provided in first bootm
-                        * command argument. If the property is not defined,
-                        * quit silently.
-                        */
-                       rd_addr = map_to_sysmem(images->fit_hdr_os);
-                       rd_noffset = fit_get_node_from_config(images,
-                                       FIT_RAMDISK_PROP, rd_addr);
-                       if (rd_noffset == -ENOENT)
-                               return 0;
-                       else if (rd_noffset < 0)
-                               return 1;
-               }
-#endif
-
-               /*
-                * Check if there is an initrd image at the
-                * address provided in the second bootm argument
-                * check image type, for FIT images get FIT node.
-                */
-               buf = map_sysmem(rd_addr, 0);
-               switch (genimg_get_format(buf)) {
-#if CONFIG_IS_ENABLED(LEGACY_IMAGE_FORMAT)
-               case IMAGE_FORMAT_LEGACY:
-                       printf("## Loading init Ramdisk from Legacy "
-                                       "Image at %08lx ...\n", rd_addr);
-
-                       bootstage_mark(BOOTSTAGE_ID_CHECK_RAMDISK);
-                       rd_hdr = image_get_ramdisk(rd_addr, arch,
-                                                       images->verify);
-
-                       if (rd_hdr == NULL)
-                               return 1;
-
-                       rd_data = image_get_data(rd_hdr);
-                       rd_len = image_get_data_size(rd_hdr);
-                       rd_load = image_get_load(rd_hdr);
-                       break;
-#endif
-#if IMAGE_ENABLE_FIT
-               case IMAGE_FORMAT_FIT:
-                       rd_noffset = fit_image_load(images,
-                                       rd_addr, &fit_uname_ramdisk,
-                                       &fit_uname_config, arch,
-                                       IH_TYPE_RAMDISK,
-                                       BOOTSTAGE_ID_FIT_RD_START,
-                                       FIT_LOAD_OPTIONAL_NON_ZERO,
-                                       &rd_data, &rd_len);
-                       if (rd_noffset < 0)
-                               return 1;
-
-                       images->fit_hdr_rd = map_sysmem(rd_addr, 0);
-                       images->fit_uname_rd = fit_uname_ramdisk;
-                       images->fit_noffset_rd = rd_noffset;
-                       break;
-#endif
-#ifdef CONFIG_ANDROID_BOOT_IMAGE
-               case IMAGE_FORMAT_ANDROID:
-                       android_image_get_ramdisk((void *)images->os.start,
-                               &rd_data, &rd_len);
-                       break;
-#endif
-               default:
-#ifdef CONFIG_SUPPORT_RAW_INITRD
-                       end = NULL;
-                       if (select)
-                               end = strchr(select, ':');
-                       if (end) {
-                               rd_len = hextoul(++end, NULL);
-                               rd_data = rd_addr;
-                       } else
-#endif
-                       {
-                               puts("Wrong Ramdisk Image Format\n");
-                               rd_data = rd_len = rd_load = 0;
-                               return 1;
-                       }
-               }
-       } else if (images->legacy_hdr_valid &&
-                       image_check_type(&images->legacy_hdr_os_copy,
-                                               IH_TYPE_MULTI)) {
-
-               /*
-                * Now check if we have a legacy mult-component image,
-                * get second entry data start address and len.
-                */
-               bootstage_mark(BOOTSTAGE_ID_RAMDISK);
-               printf("## Loading init Ramdisk from multi component "
-                               "Legacy Image at %08lx ...\n",
-                               (ulong)images->legacy_hdr_os);
-
-               image_multi_getimg(images->legacy_hdr_os, 1, &rd_data, &rd_len);
-       } else {
-               /*
-                * no initrd image
-                */
-               bootstage_mark(BOOTSTAGE_ID_NO_RAMDISK);
-               rd_len = rd_data = 0;
-       }
-
-       if (!rd_data) {
-               debug("## No init Ramdisk\n");
-       } else {
-               *rd_start = rd_data;
-               *rd_end = rd_data + rd_len;
-       }
-       debug("   ramdisk start = 0x%08lx, ramdisk end = 0x%08lx\n",
-                       *rd_start, *rd_end);
-
-       return 0;
-}
-
-#ifdef CONFIG_SYS_BOOT_RAMDISK_HIGH
-/**
- * boot_ramdisk_high - relocate init ramdisk
- * @lmb: pointer to lmb handle, will be used for memory mgmt
- * @rd_data: ramdisk data start address
- * @rd_len: ramdisk data length
- * @initrd_start: pointer to a ulong variable, will hold final init ramdisk
- *      start address (after possible relocation)
- * @initrd_end: pointer to a ulong variable, will hold final init ramdisk
- *      end address (after possible relocation)
- *
- * boot_ramdisk_high() takes a relocation hint from "initrd_high" environment
- * variable and if requested ramdisk data is moved to a specified location.
- *
- * Initrd_start and initrd_end are set to final (after relocation) ramdisk
- * start/end addresses if ramdisk image start and len were provided,
- * otherwise set initrd_start and initrd_end set to zeros.
- *
- * returns:
- *      0 - success
- *     -1 - failure
- */
-int boot_ramdisk_high(struct lmb *lmb, ulong rd_data, ulong rd_len,
-                 ulong *initrd_start, ulong *initrd_end)
-{
-       char    *s;
-       ulong   initrd_high;
-       int     initrd_copy_to_ram = 1;
-
-       s = env_get("initrd_high");
-       if (s) {
-               /* a value of "no" or a similar string will act like 0,
-                * turning the "load high" feature off. This is intentional.
-                */
-               initrd_high = hextoul(s, NULL);
-               if (initrd_high == ~0)
-                       initrd_copy_to_ram = 0;
-       } else {
-               initrd_high = env_get_bootm_mapsize() + env_get_bootm_low();
-       }
-
-
-       debug("## initrd_high = 0x%08lx, copy_to_ram = %d\n",
-                       initrd_high, initrd_copy_to_ram);
-
-       if (rd_data) {
-               if (!initrd_copy_to_ram) {      /* zero-copy ramdisk support */
-                       debug("   in-place initrd\n");
-                       *initrd_start = rd_data;
-                       *initrd_end = rd_data + rd_len;
-                       lmb_reserve(lmb, rd_data, rd_len);
-               } else {
-                       if (initrd_high)
-                               *initrd_start = (ulong)lmb_alloc_base(lmb,
-                                               rd_len, 0x1000, initrd_high);
-                       else
-                               *initrd_start = (ulong)lmb_alloc(lmb, rd_len,
-                                                                0x1000);
-
-                       if (*initrd_start == 0) {
-                               puts("ramdisk - allocation error\n");
-                               goto error;
-                       }
-                       bootstage_mark(BOOTSTAGE_ID_COPY_RAMDISK);
-
-                       *initrd_end = *initrd_start + rd_len;
-                       printf("   Loading Ramdisk to %08lx, end %08lx ... ",
-                                       *initrd_start, *initrd_end);
-
-                       memmove_wd((void *)*initrd_start,
-                                       (void *)rd_data, rd_len, CHUNKSZ);
-
-#ifdef CONFIG_MP
-                       /*
-                        * Ensure the image is flushed to memory to handle
-                        * AMP boot scenarios in which we might not be
-                        * HW cache coherent
-                        */
-                       flush_cache((unsigned long)*initrd_start,
-                                   ALIGN(rd_len, ARCH_DMA_MINALIGN));
-#endif
-                       puts("OK\n");
-               }
-       } else {
-               *initrd_start = 0;
-               *initrd_end = 0;
-       }
-       debug("   ramdisk load start = 0x%08lx, ramdisk load end = 0x%08lx\n",
-                       *initrd_start, *initrd_end);
-
-       return 0;
-
-error:
-       return -1;
-}
-#endif /* CONFIG_SYS_BOOT_RAMDISK_HIGH */
-
-int boot_get_setup(bootm_headers_t *images, uint8_t arch,
-                  ulong *setup_start, ulong *setup_len)
-{
-#if IMAGE_ENABLE_FIT
-       return boot_get_setup_fit(images, arch, setup_start, setup_len);
-#else
-       return -ENOENT;
-#endif
-}
-
-#if IMAGE_ENABLE_FIT
-#if defined(CONFIG_FPGA)
-int boot_get_fpga(int argc, char *const argv[], bootm_headers_t *images,
-                 uint8_t arch, const ulong *ld_start, ulong * const ld_len)
-{
-       ulong tmp_img_addr, img_data, img_len;
-       void *buf;
-       int conf_noffset;
-       int fit_img_result;
-       const char *uname, *name;
-       int err;
-       int devnum = 0; /* TODO support multi fpga platforms */
-
-       /* Check to see if the images struct has a FIT configuration */
-       if (!genimg_has_config(images)) {
-               debug("## FIT configuration was not specified\n");
-               return 0;
-       }
-
-       /*
-        * Obtain the os FIT header from the images struct
-        */
-       tmp_img_addr = map_to_sysmem(images->fit_hdr_os);
-       buf = map_sysmem(tmp_img_addr, 0);
-       /*
-        * Check image type. For FIT images get FIT node
-        * and attempt to locate a generic binary.
-        */
-       switch (genimg_get_format(buf)) {
-       case IMAGE_FORMAT_FIT:
-               conf_noffset = fit_conf_get_node(buf, images->fit_uname_cfg);
-
-               uname = fdt_stringlist_get(buf, conf_noffset, FIT_FPGA_PROP, 0,
-                                          NULL);
-               if (!uname) {
-                       debug("## FPGA image is not specified\n");
-                       return 0;
-               }
-               fit_img_result = fit_image_load(images,
-                                               tmp_img_addr,
-                                               (const char **)&uname,
-                                               &(images->fit_uname_cfg),
-                                               arch,
-                                               IH_TYPE_FPGA,
-                                               BOOTSTAGE_ID_FPGA_INIT,
-                                               FIT_LOAD_OPTIONAL_NON_ZERO,
-                                               &img_data, &img_len);
-
-               debug("FPGA image (%s) loaded to 0x%lx/size 0x%lx\n",
-                     uname, img_data, img_len);
-
-               if (fit_img_result < 0) {
-                       /* Something went wrong! */
-                       return fit_img_result;
-               }
-
-               if (!fpga_is_partial_data(devnum, img_len)) {
-                       name = "full";
-                       err = fpga_loadbitstream(devnum, (char *)img_data,
-                                                img_len, BIT_FULL);
-                       if (err)
-                               err = fpga_load(devnum, (const void *)img_data,
-                                               img_len, BIT_FULL);
-               } else {
-                       name = "partial";
-                       err = fpga_loadbitstream(devnum, (char *)img_data,
-                                                img_len, BIT_PARTIAL);
-                       if (err)
-                               err = fpga_load(devnum, (const void *)img_data,
-                                               img_len, BIT_PARTIAL);
-               }
-
-               if (err)
-                       return err;
-
-               printf("   Programming %s bitstream... OK\n", name);
-               break;
-       default:
-               printf("The given image format is not supported (corrupt?)\n");
-               return 1;
-       }
-
-       return 0;
-}
-#endif
-
-static void fit_loadable_process(uint8_t img_type,
-                                ulong img_data,
-                                ulong img_len)
-{
-       int i;
-       const unsigned int count =
-                       ll_entry_count(struct fit_loadable_tbl, fit_loadable);
-       struct fit_loadable_tbl *fit_loadable_handler =
-                       ll_entry_start(struct fit_loadable_tbl, fit_loadable);
-       /* For each loadable handler */
-       for (i = 0; i < count; i++, fit_loadable_handler++)
-               /* matching this type */
-               if (fit_loadable_handler->type == img_type)
-                       /* call that handler with this image data */
-                       fit_loadable_handler->handler(img_data, img_len);
-}
-
-int boot_get_loadable(int argc, char *const argv[], bootm_headers_t *images,
-                     uint8_t arch, const ulong *ld_start, ulong * const ld_len)
-{
-       /*
-        * These variables are used to hold the current image location
-        * in system memory.
-        */
-       ulong tmp_img_addr;
-       /*
-        * These two variables are requirements for fit_image_load, but
-        * their values are not used
-        */
-       ulong img_data, img_len;
-       void *buf;
-       int loadables_index;
-       int conf_noffset;
-       int fit_img_result;
-       const char *uname;
-       uint8_t img_type;
-
-       /* Check to see if the images struct has a FIT configuration */
-       if (!genimg_has_config(images)) {
-               debug("## FIT configuration was not specified\n");
-               return 0;
-       }
-
-       /*
-        * Obtain the os FIT header from the images struct
-        */
-       tmp_img_addr = map_to_sysmem(images->fit_hdr_os);
-       buf = map_sysmem(tmp_img_addr, 0);
-       /*
-        * Check image type. For FIT images get FIT node
-        * and attempt to locate a generic binary.
-        */
-       switch (genimg_get_format(buf)) {
-       case IMAGE_FORMAT_FIT:
-               conf_noffset = fit_conf_get_node(buf, images->fit_uname_cfg);
-
-               for (loadables_index = 0;
-                    uname = fdt_stringlist_get(buf, conf_noffset,
-                                       FIT_LOADABLE_PROP, loadables_index,
-                                       NULL), uname;
-                    loadables_index++)
-               {
-                       fit_img_result = fit_image_load(images,
-                               tmp_img_addr,
-                               &uname,
-                               &(images->fit_uname_cfg), arch,
-                               IH_TYPE_LOADABLE,
-                               BOOTSTAGE_ID_FIT_LOADABLE_START,
-                               FIT_LOAD_OPTIONAL_NON_ZERO,
-                               &img_data, &img_len);
-                       if (fit_img_result < 0) {
-                               /* Something went wrong! */
-                               return fit_img_result;
-                       }
-
-                       fit_img_result = fit_image_get_node(buf, uname);
-                       if (fit_img_result < 0) {
-                               /* Something went wrong! */
-                               return fit_img_result;
-                       }
-                       fit_img_result = fit_image_get_type(buf,
-                                                           fit_img_result,
-                                                           &img_type);
-                       if (fit_img_result < 0) {
-                               /* Something went wrong! */
-                               return fit_img_result;
-                       }
-
-                       fit_loadable_process(img_type, img_data, img_len);
-               }
-               break;
-       default:
-               printf("The given image format is not supported (corrupt?)\n");
-               return 1;
-       }
-
-       return 0;
-}
-#endif
-
-#ifdef CONFIG_SYS_BOOT_GET_CMDLINE
-/**
- * boot_get_cmdline - allocate and initialize kernel cmdline
- * @lmb: pointer to lmb handle, will be used for memory mgmt
- * @cmd_start: pointer to a ulong variable, will hold cmdline start
- * @cmd_end: pointer to a ulong variable, will hold cmdline end
- *
- * boot_get_cmdline() allocates space for kernel command line below
- * BOOTMAPSZ + env_get_bootm_low() address. If "bootargs" U-Boot environment
- * variable is present its contents is copied to allocated kernel
- * command line.
- *
- * returns:
- *      0 - success
- *     -1 - failure
- */
-int boot_get_cmdline(struct lmb *lmb, ulong *cmd_start, ulong *cmd_end)
-{
-       char *cmdline;
-       char *s;
-
-       cmdline = (char *)(ulong)lmb_alloc_base(lmb, CONFIG_SYS_BARGSIZE, 0xf,
-                               env_get_bootm_mapsize() + env_get_bootm_low());
-
-       if (cmdline == NULL)
-               return -1;
-
-       s = env_get("bootargs");
-       if (!s)
-               s = "";
-
-       strcpy(cmdline, s);
-
-       *cmd_start = (ulong) & cmdline[0];
-       *cmd_end = *cmd_start + strlen(cmdline);
-
-       debug("## cmdline at 0x%08lx ... 0x%08lx\n", *cmd_start, *cmd_end);
-
-       return 0;
-}
-#endif /* CONFIG_SYS_BOOT_GET_CMDLINE */
-
-#ifdef CONFIG_SYS_BOOT_GET_KBD
-/**
- * boot_get_kbd - allocate and initialize kernel copy of board info
- * @lmb: pointer to lmb handle, will be used for memory mgmt
- * @kbd: double pointer to board info data
- *
- * boot_get_kbd() allocates space for kernel copy of board info data below
- * BOOTMAPSZ + env_get_bootm_low() address and kernel board info is initialized
- * with the current u-boot board info data.
- *
- * returns:
- *      0 - success
- *     -1 - failure
- */
-int boot_get_kbd(struct lmb *lmb, struct bd_info **kbd)
-{
-       *kbd = (struct bd_info *)(ulong)lmb_alloc_base(lmb,
-                                                      sizeof(struct bd_info),
-                                                      0xf,
-                                                      env_get_bootm_mapsize() + env_get_bootm_low());
-       if (*kbd == NULL)
-               return -1;
-
-       **kbd = *(gd->bd);
-
-       debug("## kernel board info at 0x%08lx\n", (ulong)*kbd);
-
-#if defined(DEBUG) && defined(CONFIG_CMD_BDI)
-       do_bdinfo(NULL, 0, 0, NULL);
-#endif
-
-       return 0;
-}
-#endif /* CONFIG_SYS_BOOT_GET_KBD */
-
-#ifdef CONFIG_LMB
-int image_setup_linux(bootm_headers_t *images)
-{
-       ulong of_size = images->ft_len;
-       char **of_flat_tree = &images->ft_addr;
-       struct lmb *lmb = &images->lmb;
-       int ret;
-
-       if (IMAGE_ENABLE_OF_LIBFDT)
-               boot_fdt_add_mem_rsv_regions(lmb, *of_flat_tree);
-
-       if (IMAGE_BOOT_GET_CMDLINE) {
-               ret = boot_get_cmdline(lmb, &images->cmdline_start,
-                               &images->cmdline_end);
-               if (ret) {
-                       puts("ERROR with allocation of cmdline\n");
-                       return ret;
-               }
-       }
-
-       if (IMAGE_ENABLE_OF_LIBFDT) {
-               ret = boot_relocate_fdt(lmb, of_flat_tree, &of_size);
-               if (ret)
-                       return ret;
-       }
-
-       if (IMAGE_ENABLE_OF_LIBFDT && of_size) {
-               ret = image_setup_libfdt(images, *of_flat_tree, of_size, lmb);
-               if (ret)
-                       return ret;
-       }
-
-       return 0;
-}
-#endif /* CONFIG_LMB */
-#endif /* !USE_HOSTCC */