Merge branch 'master' of git://git.denx.de/u-boot-spi

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

diff --git a/common/spl/spl_nand.c b/common/spl/spl_nand.c
index ed758e518ca8adf8d8d29ebdb068c65f79f95698..e2bcefb111e1f94bfc78b54a86cd09c19ff546ff 100644 (file)
--- a/common/spl/spl_nand.c
+++ b/common/spl/spl_nand.c
@@ -1,26 +1,30 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2011
  * Corscience GmbH & Co. KG - Simon Schwarz <schwarz@corscience.de>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 #include <common.h>
 #include <config.h>
 #include <spl.h>
 #include <asm/io.h>
 #include <nand.h>
-#include <libfdt_env.h>
+#include <linux/libfdt_env.h>
 #include <fdt.h>
 
 #if defined(CONFIG_SPL_NAND_RAW_ONLY)
-int spl_nand_load_image(struct spl_boot_device *bootdev)
+static int spl_nand_load_image(struct spl_image_info *spl_image,
+                       struct spl_boot_device *bootdev)
 {
        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);
+
        nand_spl_load_image(CONFIG_SYS_NAND_U_BOOT_OFFS,
                            CONFIG_SYS_NAND_U_BOOT_SIZE,
                            (void *)CONFIG_SYS_NAND_U_BOOT_DST);
-       spl_set_header_raw_uboot(&spl_image);
+       spl_set_header_raw_uboot(spl_image);
        nand_deselect();
 
        return 0;
@@ -39,7 +43,8 @@ static ulong spl_nand_fit_read(struct spl_load_info *load, ulong offs,
                return 0;
 }
 
-static int spl_nand_load_element(int offset, struct image_header *header)
+static int spl_nand_load_element(struct spl_image_info *spl_image,
+                                int offset, struct image_header *header)
 {
        int err;
 
@@ -57,17 +62,18 @@ static int spl_nand_load_element(int offset, struct image_header *header)
                load.filename = NULL;
                load.bl_len = 1;
                load.read = spl_nand_fit_read;
-               return spl_load_simple_fit(&load, offset, header);
+               return spl_load_simple_fit(spl_image, &load, offset, header);
        } else {
-               err = spl_parse_image_header(&spl_image, 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);
        }
 }
 
-static int spl_nand_load_image(struct spl_boot_device *bootdev)
+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 +87,8 @@ static int spl_nand_load_image(struct spl_boot_device *bootdev)
 #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 +113,15 @@ static int spl_nand_load_image(struct spl_boot_device *bootdev)
                /* 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, 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,17 +133,19 @@ static int spl_nand_load_image(struct spl_boot_device *bootdev)
        }
 #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, CONFIG_SYS_NAND_U_BOOT_OFFS,
+                                   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(CONFIG_SYS_NAND_U_BOOT_OFFS_REDUND,
+               err = spl_nand_load_element(spl_image,
+                                           CONFIG_SYS_NAND_U_BOOT_OFFS_REDUND,
                                            header);
 #endif
 #endif
@@ -146,4 +154,4 @@ static int spl_nand_load_image(struct spl_boot_device *bootdev)
 }
 #endif
 /* Use priorty 1 so that Ubi can override this */
-SPL_LOAD_IMAGE_METHOD(1, BOOT_DEVICE_NAND, spl_nand_load_image);
+SPL_LOAD_IMAGE_METHOD("NAND", 1, BOOT_DEVICE_NAND, spl_nand_load_image);