[U-Boot] [PATCH v2 1/7] spl: fix assignment of board info to global data

[Simon Glass]

Hi York,

On 14 September 2017 at 13:01, York Sun <york.sun at nxp.com> wrote:
> This partially reverts commit 15eb1d43bf470b85e9031c2fce7e0ce7b27dd321
> which 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 board_init_r().
> Moving such assignment to board_init_r() would be moving it later.
>
> Signed-off-by: York Sun <york.sun at nxp.com>
> CC: Lokesh Vutla <lokeshvutla at ti.com>
> CC: Ravi Babu <ravibabu at ti.com>
> CC: Lukasz Majewski <lukma at denx.de>
> CC: Tom Rini <trini at konsulko.com>
>
> ---
>
> Changes in v2:
> New patch to fix spl after rebasing to latest master.
>
>  common/spl/spl.c | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/common/spl/spl.c b/common/spl/spl.c
> index ce9819e..98b0ca0 100644
> --- a/common/spl/spl.c
> +++ b/common/spl/spl.c
> @@ -365,7 +365,10 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
>         struct spl_image_info spl_image;
>
>         debug(">>spl:board_init_r()\n");
> -       gd->bd = &bdata;
> +
> +       if (!gd->bd)
> +               gd->bd = &bdata;
> +
>  #ifdef CONFIG_SPL_OS_BOOT
>         dram_init_banksize();
>  #endif
> @@ -450,6 +453,9 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
>   */
>  void preloader_console_init(void)
>  {
> +       if (!gd->bd)
> +               gd->bd = &bdata;
> +

It seems odd that enabling the console sets this data.

What was the impact of moving it later for your board?


>         gd->baudrate = CONFIG_BAUDRATE;
>
>         serial_init();          /* serial communications setup */
> --
> 2.7.4
>

Regards,
Simon