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 6eb190f1ea540da99fc2a6db9c3bedf92aadf4c8..59f4a84a36ac9a39be89b9c412bcec12a56c50fe 100644 (file)
--- a/common/spl/spl_nand.c
+++ b/common/spl/spl_nand.c
@@ -5,19 +5,31 @@
  */
 #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)
 {
        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_image);
@@ -30,18 +42,33 @@ 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;
+#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;
+}
+
+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);
@@ -53,12 +80,21 @@ static int spl_nand_load_element(struct spl_image_info *spl_image,
                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(spl_image, &load, offset, header);
+               return spl_load_imx_container(spl_image, &load, offset / bl_len);
        } else {
                err = spl_parse_image_header(spl_image, header);
                if (err)
@@ -135,7 +171,7 @@ static int spl_nand_load_image(struct spl_image_info *spl_image,
 #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, 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