spl: fix assignment of board info to global data

Commit 15eb1d43bf47 ("spl: reorder the assignment of board info to
global data") intended to move assignment of board info earlier,
into board_init_r(). However, function preload_console_init() is
called either from spl_board_init() or from board_init_f(). For the
latter case, the board info assignment is much earlier than proposed
board_init_r(). Create a new function to fill gd->bd and call this
function when needed.

Signed-off-by: York Sun <york.sun@nxp.com>
CC: Lokesh Vutla <lokeshvutla@ti.com>
CC: Ravi Babu <ravibabu@ti.com>
CC: Lukasz Majewski <lukma@denx.de>
CC: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/arm/cpu/armv8/fsl-layerscape/spl.c b/arch/arm/cpu/armv8/fsl-layerscape/spl.c
index 2776240be38bef1ae93c80861b22d953426c44dc..2534b4be5fe31e7dfebe057e76d83f13a40b6192 100644 (file)
--- a/arch/arm/cpu/armv8/fsl-layerscape/spl.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/spl.c
@@ -80,6 +80,7 @@ void board_init_f(ulong dummy)
        get_clocks();
 
        preloader_console_init();
+       spl_set_bd();
 
 #ifdef CONFIG_SPL_I2C_SUPPORT
        i2c_init_all();

diff --git a/common/spl/spl.c b/common/spl/spl.c
index 4afbe97fc1253312b4dc1f4213bb3ec8d0114e46..aaddddd99580221211b85ddf5b05bee5ccbb257d 100644 (file)
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -258,6 +258,12 @@ static int spl_common_init(bool setup_malloc)
        return 0;
 }
 
+void spl_set_bd(void)
+{
+       if (!gd->bd)
+               gd->bd = &bdata;
+}
+
 int spl_early_init(void)
 {
        int ret;
@@ -365,7 +371,9 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
        struct spl_image_info spl_image;
 
        debug(">>spl:board_init_r()\n");
-       gd->bd = &bdata;
+
+       spl_set_bd();
+
 #ifdef CONFIG_SPL_OS_BOOT
        dram_init_banksize();
 #endif

diff --git a/include/spl.h b/include/spl.h
index ce4cf0abbebb6e599d7b8727afbf65fe80bfe348..b14a29c57cc46c91e78b36025f555ce11bec0518 100644 (file)
--- a/include/spl.h
+++ b/include/spl.h
@@ -68,6 +68,7 @@ int spl_load_simple_fit(struct spl_image_info *spl_image,
 void preloader_console_init(void);
 u32 spl_boot_device(void);
 u32 spl_boot_mode(const u32 boot_device);
+void spl_set_bd(void);
 
 /**
  * spl_set_header_raw_uboot() - Set up a standard SPL image structure