global: Move remaining CONFIG_SYS_NAND_* to CFG_SYS_NAND_*

[platform/kernel/u-boot.git] / common / spl / spl_nand.c

diff --git a/common/spl/spl_nand.c b/common/spl/spl_nand.c
index e2bcefb..dc45204 100644 (file)
--- a/common/spl/spl_nand.c
+++ b/common/spl/spl_nand.c
@@ -5,12 +5,20 @@
  */
 #include <common.h>
 #include <config.h>
+#include <fdt_support.h>
+#include <image.h>
+#include <log.h>
 #include <spl.h>
 #include <asm/io.h>
 #include <nand.h>
 #include <linux/libfdt_env.h>
 #include <fdt.h>
 
+uint32_t __weak spl_nand_get_uboot_raw_page(void)
+{
+       return CONFIG_SYS_NAND_U_BOOT_OFFS;
+}
+
 #if defined(CONFIG_SPL_NAND_RAW_ONLY)
 static int spl_nand_load_image(struct spl_image_info *spl_image,
                        struct spl_boot_device *bootdev)
@@ -18,12 +26,12 @@ static int spl_nand_load_image(struct spl_image_info *spl_image,
        nand_init();
 
        printf("Loading U-Boot from 0x%08x (size 0x%08x) to 0x%08x\n",
-              CONFIG_SYS_NAND_U_BOOT_OFFS, CONFIG_SYS_NAND_U_BOOT_SIZE,
-              CONFIG_SYS_NAND_U_BOOT_DST);
+              CONFIG_SYS_NAND_U_BOOT_OFFS, CFG_SYS_NAND_U_BOOT_SIZE,
+              CFG_SYS_NAND_U_BOOT_DST);
 
-       nand_spl_load_image(CONFIG_SYS_NAND_U_BOOT_OFFS,
-                           CONFIG_SYS_NAND_U_BOOT_SIZE,
-                           (void *)CONFIG_SYS_NAND_U_BOOT_DST);
+       nand_spl_load_image(spl_nand_get_uboot_raw_page(),
+                           CFG_SYS_NAND_U_BOOT_SIZE,
+                           (void *)CFG_SYS_NAND_U_BOOT_DST);
        spl_set_header_raw_uboot(spl_image);
        nand_deselect();
 
@@ -34,18 +42,46 @@ static int spl_nand_load_image(struct spl_image_info *spl_image,
 static ulong spl_nand_fit_read(struct spl_load_info *load, ulong offs,
                               ulong size, void *dst)
 {
-       int ret;
+       int err;
+       ulong sector;
+
+       sector = *(int *)load->priv;
+       offs *= load->bl_len;
+       size *= load->bl_len;
+       offs = sector + nand_spl_adjust_offset(sector, offs - sector);
+       err = nand_spl_load_image(offs, size, dst);
+       if (err)
+               return 0;
+
+       return size / load->bl_len;
+}
+
+static ulong spl_nand_legacy_read(struct spl_load_info *load, ulong offs,
+                                 ulong size, void *dst)
+{
+       int err;
 
-       ret = nand_spl_load_image(offs, size, dst);
-       if (!ret)
-               return size;
-       else
+       debug("%s: offs %lx, size %lx, dst %p\n",
+             __func__, offs, size, dst);
+
+       err = nand_spl_load_image(offs, size, dst);
+       if (err)
                return 0;
+
+       return size;
+}
+
+struct mtd_info * __weak nand_get_mtd(void)
+{
+       return NULL;
 }
 
 static int spl_nand_load_element(struct spl_image_info *spl_image,
-                                int offset, struct image_header *header)
+                                struct spl_boot_device *bootdev,
+                                int offset, struct legacy_img_hdr *header)
 {
+       struct mtd_info *mtd = nand_get_mtd();
+       int bl_len = mtd ? mtd->writesize : 1;
        int err;
 
        err = nand_spl_load_image(offset, sizeof(*header), (void *)header);
@@ -58,13 +94,34 @@ static int spl_nand_load_element(struct spl_image_info *spl_image,
 
                debug("Found FIT\n");
                load.dev = NULL;
+               load.priv = &offset;
+               load.filename = NULL;
+               load.bl_len = bl_len;
+               load.read = spl_nand_fit_read;
+               return spl_load_simple_fit(spl_image, &load, offset / bl_len, header);
+       } else if (IS_ENABLED(CONFIG_SPL_LOAD_IMX_CONTAINER)) {
+               struct spl_load_info load;
+
+               load.dev = NULL;
                load.priv = NULL;
                load.filename = NULL;
-               load.bl_len = 1;
+               load.bl_len = bl_len;
                load.read = spl_nand_fit_read;
-               return spl_load_simple_fit(spl_image, &load, offset, header);
+               return spl_load_imx_container(spl_image, &load, offset / bl_len);
+       } else if (IS_ENABLED(CONFIG_SPL_LEGACY_IMAGE_FORMAT) &&
+                  image_get_magic(header) == IH_MAGIC) {
+               struct spl_load_info load;
+
+               debug("Found legacy image\n");
+               load.dev = NULL;
+               load.priv = NULL;
+               load.filename = NULL;
+               load.bl_len = 1;
+               load.read = spl_nand_legacy_read;
+
+               return spl_load_legacy_img(spl_image, bootdev, &load, offset, header);
        } else {
-               err = spl_parse_image_header(spl_image, header);
+               err = spl_parse_image_header(spl_image, bootdev, header);
                if (err)
                        return err;
                return nand_spl_load_image(offset, spl_image->size,
@@ -76,7 +133,7 @@ static int spl_nand_load_image(struct spl_image_info *spl_image,
                               struct spl_boot_device *bootdev)
 {
        int err;
-       struct image_header *header;
+       struct legacy_img_hdr *header;
        int *src __attribute__((unused));
        int *dst __attribute__((unused));
 
@@ -89,7 +146,7 @@ static int spl_nand_load_image(struct spl_image_info *spl_image,
 
        header = spl_get_load_buffer(0, sizeof(*header));
 
-#ifdef CONFIG_SPL_OS_BOOT
+#if CONFIG_IS_ENABLED(OS_BOOT)
        if (!spl_start_uboot()) {
                /*
                 * load parameter image
@@ -100,11 +157,11 @@ static int spl_nand_load_image(struct spl_image_info *spl_image,
                 */
                nand_spl_load_image(CONFIG_CMD_SPL_NAND_OFS,
                        CONFIG_CMD_SPL_WRITE_SIZE,
-                       (void *)CONFIG_SYS_TEXT_BASE);
+                       (void *)CONFIG_TEXT_BASE);
                /* copy to destintion */
                for (dst = (int *)CONFIG_SYS_SPL_ARGS_ADDR,
-                               src = (int *)CONFIG_SYS_TEXT_BASE;
-                               src < (int *)(CONFIG_SYS_TEXT_BASE +
+                               src = (int *)CONFIG_TEXT_BASE;
+                               src < (int *)(CONFIG_TEXT_BASE +
                                CONFIG_CMD_SPL_WRITE_SIZE);
                                src++, dst++) {
                        writel(readl(src), dst);
@@ -113,7 +170,7 @@ static int spl_nand_load_image(struct spl_image_info *spl_image,
                /* load linux */
                nand_spl_load_image(CONFIG_SYS_NAND_SPL_KERNEL_OFFS,
                        sizeof(*header), (void *)header);
-               err = spl_parse_image_header(spl_image, header);
+               err = spl_parse_image_header(spl_image, bootdev, header);
                if (err)
                        return err;
                if (header->ih_os == IH_OS_LINUX) {
@@ -133,18 +190,18 @@ static int spl_nand_load_image(struct spl_image_info *spl_image,
        }
 #endif
 #ifdef CONFIG_NAND_ENV_DST
-       spl_nand_load_element(spl_image, CONFIG_ENV_OFFSET, header);
+       spl_nand_load_element(spl_image, bootdev, CONFIG_ENV_OFFSET, header);
 #ifdef CONFIG_ENV_OFFSET_REDUND
-       spl_nand_load_element(spl_image, CONFIG_ENV_OFFSET_REDUND, header);
+       spl_nand_load_element(spl_image, bootdev, CONFIG_ENV_OFFSET_REDUND, header);
 #endif
 #endif
        /* Load u-boot */
-       err = spl_nand_load_element(spl_image, CONFIG_SYS_NAND_U_BOOT_OFFS,
+       err = spl_nand_load_element(spl_image, bootdev, spl_nand_get_uboot_raw_page(),
                                    header);
 #ifdef CONFIG_SYS_NAND_U_BOOT_OFFS_REDUND
 #if CONFIG_SYS_NAND_U_BOOT_OFFS != CONFIG_SYS_NAND_U_BOOT_OFFS_REDUND
        if (err)
-               err = spl_nand_load_element(spl_image,
+               err = spl_nand_load_element(spl_image, bootdev,
                                            CONFIG_SYS_NAND_U_BOOT_OFFS_REDUND,
                                            header);
 #endif