spl: nor: introduce spl_nor_get_uboot_base

Introduce weak spl_nor_get_uboot_base, then platform have their own
implementation.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Cc: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
Cc: Tien Fong Chee <tien.fong.chee@intel.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Andreas Dannenberg <dannenberg@ti.com>
Cc: Alex Kiernan <alex.kiernan@gmail.com>
Cc: Stefan Roese <sr@denx.de>
Cc: Patrick Delaunay <patrick.delaunay@st.com>
Cc: Miquel Raynal <miquel.raynal@bootlin.com>
Cc: Michal Simek <michal.simek@xilinx.com>

diff --git a/common/spl/spl_nor.c b/common/spl/spl_nor.c
index 969e319de06a5457a70b7a1093533f68f0b96ede..0f8afa6f926e73bc5854e0d8dcbb9a32f528b7e8 100644 (file)
--- a/common/spl/spl_nor.c
+++ b/common/spl/spl_nor.c
@@ -18,6 +18,11 @@ static ulong spl_nor_load_read(struct spl_load_info *load, ulong sector,
 }
 #endif
 
+unsigned long __weak spl_nor_get_uboot_base(void)
+{
+       return CONFIG_SYS_UBOOT_BASE;
+}
+
 static int spl_nor_load_image(struct spl_image_info *spl_image,
                              struct spl_boot_device *bootdev)
 {
@@ -80,25 +85,25 @@ static int spl_nor_load_image(struct spl_image_info *spl_image,
         * defined location in SDRAM
         */
 #ifdef CONFIG_SPL_LOAD_FIT
-       header = (const struct image_header *)CONFIG_SYS_UBOOT_BASE;
+       header = (const struct image_header *)spl_nor_get_uboot_base();
        if (image_get_magic(header) == FDT_MAGIC) {
                debug("Found FIT format U-Boot\n");
                load.bl_len = 1;
                load.read = spl_nor_load_read;
                ret = spl_load_simple_fit(spl_image, &load,
-                                         CONFIG_SYS_UBOOT_BASE,
+                                         spl_nor_get_uboot_base(),
                                          (void *)header);
 
                return ret;
        }
 #endif
        ret = spl_parse_image_header(spl_image,
-                       (const struct image_header *)CONFIG_SYS_UBOOT_BASE);
+                       (const struct image_header *)spl_nor_get_uboot_base());
        if (ret)
                return ret;
 
        memcpy((void *)(unsigned long)spl_image->load_addr,
-              (void *)(CONFIG_SYS_UBOOT_BASE + sizeof(struct image_header)),
+              (void *)(spl_nor_get_uboot_base() + sizeof(struct image_header)),
               spl_image->size);
 
        return 0;