tools: kwboot: Refactor and fix writing buffer

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

diff --git a/common/spl/spl_nand.c b/common/spl/spl_nand.c
index 7cf0d1b986000b3851cd06e57b349633f9a4bea1..59f4a84a36ac9a39be89b9c412bcec12a56c50fe 100644 (file)
--- a/common/spl/spl_nand.c
+++ b/common/spl/spl_nand.c
@@ -1,26 +1,38 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2011
  * Corscience GmbH & Co. KG - Simon Schwarz <[email protected]>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 #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 <libfdt_env.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)
-int spl_nand_load_image(void)
+static int spl_nand_load_image(struct spl_image_info *spl_image,
+                       struct spl_boot_device *bootdev)
 {
        nand_init();
 
-       nand_spl_load_image(CONFIG_SYS_NAND_U_BOOT_OFFS,
+       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);
+
+       nand_spl_load_image(spl_nand_get_uboot_raw_page(),
                            CONFIG_SYS_NAND_U_BOOT_SIZE,
                            (void *)CONFIG_SYS_NAND_U_BOOT_DST);
-       spl_set_header_raw_uboot();
+       spl_set_header_raw_uboot(spl_image);
        nand_deselect();
 
        return 0;
@@ -30,17 +42,33 @@ int spl_nand_load_image(void)
 static ulong spl_nand_fit_read(struct spl_load_info *load, ulong offs,
                               ulong size, void *dst)
 {
-       int ret;
+       int err;
+#ifdef CONFIG_SYS_NAND_BLOCK_SIZE
+       ulong sector;
 
-       ret = nand_spl_load_image(offs, size, dst);
-       if (!ret)
-               return size;
-       else
+       sector = *(int *)load->priv;
+       offs = sector + nand_spl_adjust_offset(sector, offs - sector);
+#else
+       offs *= load->bl_len;
+       size *= load->bl_len;
+#endif
+       err = nand_spl_load_image(offs, size, dst);
+       if (err)
                return 0;
+
+       return size / load->bl_len;
 }
 
-static int spl_nand_load_element(int offset, struct image_header *header)
+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 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);
@@ -52,22 +80,32 @@ static int spl_nand_load_element(int offset, struct image_header *header)
                struct spl_load_info load;
 
                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(&load, offset, header);
+               return spl_load_imx_container(spl_image, &load, offset / bl_len);
        } else {
-               err = spl_parse_image_header(header);
+               err = spl_parse_image_header(spl_image, header);
                if (err)
                        return err;
-               return nand_spl_load_image(offset, spl_image.size,
-                                          (void *)(ulong)spl_image.load_addr);
+               return nand_spl_load_image(offset, spl_image->size,
+                                          (void *)(ulong)spl_image->load_addr);
        }
 }
 
-int spl_nand_load_image(void)
+static int spl_nand_load_image(struct spl_image_info *spl_image,
+                              struct spl_boot_device *bootdev)
 {
        int err;
        struct image_header *header;
@@ -81,8 +119,8 @@ int spl_nand_load_image(void)
 #endif
        nand_init();
 
-       /*use CONFIG_SYS_TEXT_BASE as temporary storage area */
-       header = (struct image_header *)(CONFIG_SYS_TEXT_BASE);
+       header = spl_get_load_buffer(0, sizeof(*header));
+
 #ifdef CONFIG_SPL_OS_BOOT
        if (!spl_start_uboot()) {
                /*
@@ -107,15 +145,15 @@ int spl_nand_load_image(void)
                /* load linux */
                nand_spl_load_image(CONFIG_SYS_NAND_SPL_KERNEL_OFFS,
                        sizeof(*header), (void *)header);
-               err = spl_parse_image_header(header);
+               err = spl_parse_image_header(spl_image, header);
                if (err)
                        return err;
                if (header->ih_os == IH_OS_LINUX) {
                        /* happy - was a linux */
                        err = nand_spl_load_image(
                                CONFIG_SYS_NAND_SPL_KERNEL_OFFS,
-                               spl_image.size,
-                               (void *)spl_image.load_addr);
+                               spl_image->size,
+                               (void *)spl_image->load_addr);
                        nand_deselect();
                        return err;
                } else {
@@ -127,14 +165,25 @@ int spl_nand_load_image(void)
        }
 #endif
 #ifdef CONFIG_NAND_ENV_DST
-       spl_nand_load_element(CONFIG_ENV_OFFSET, header);
+       spl_nand_load_element(spl_image, CONFIG_ENV_OFFSET, header);
 #ifdef CONFIG_ENV_OFFSET_REDUND
-       spl_nand_load_element(CONFIG_ENV_OFFSET_REDUND, header);
+       spl_nand_load_element(spl_image, CONFIG_ENV_OFFSET_REDUND, header);
 #endif
 #endif
        /* Load u-boot */
-       err = spl_nand_load_element(CONFIG_SYS_NAND_U_BOOT_OFFS, header);
+       err = spl_nand_load_element(spl_image, 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,
+                                           CONFIG_SYS_NAND_U_BOOT_OFFS_REDUND,
+                                           header);
+#endif
+#endif
        nand_deselect();
        return err;
 }
 #endif
+/* Use priorty 1 so that Ubi can override this */
+SPL_LOAD_IMAGE_METHOD("NAND", 1, BOOT_DEVICE_NAND, spl_nand_load_image);