]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
spl: nand: Map memory before accessing it
authorSean Anderson <seanga2@gmail.com>
Sat, 4 Nov 2023 20:37:46 +0000 (16:37 -0400)
committerTom Rini <trini@konsulko.com>
Thu, 16 Nov 2023 17:43:48 +0000 (12:43 -0500)
In sandbox we must map memory before accessing it. Do so for the NAND load
method.

Signed-off-by: Sean Anderson <seanga2@gmail.com>
common/spl/spl_nand.c

index 57a7a1a73b98d4ffb54d8a23edcb4b7ccdd70ac5..b8cd6403ba45f08425885f6ce296f214553eb1ee 100644 (file)
@@ -11,6 +11,7 @@
 #include <log.h>
 #include <spl.h>
 #include <asm/io.h>
+#include <mapmem.h>
 #include <nand.h>
 #include <linux/libfdt_env.h>
 #include <fdt.h>
@@ -32,7 +33,8 @@ static int spl_nand_load_image(struct spl_image_info *spl_image,
 
        nand_spl_load_image(spl_nand_get_uboot_raw_page(),
                            CFG_SYS_NAND_U_BOOT_SIZE,
-                           (void *)CFG_SYS_NAND_U_BOOT_DST);
+                           map_sysmem(CFG_SYS_NAND_U_BOOT_DST,
+                                      CFG_SYS_NAND_U_BOOT_SIZE));
        spl_set_header_raw_uboot(spl_image);
        nand_deselect();
 
@@ -122,7 +124,8 @@ static int spl_nand_load_element(struct spl_image_info *spl_image,
                if (err)
                        return err;
                return nand_spl_load_image(offset, spl_image->size,
-                                          (void *)(ulong)spl_image->load_addr);
+                                          map_sysmem(spl_image->load_addr,
+                                                     spl_image->size));
        }
 }