On 08/05/2018 09:34 PM, Simon Goldschmidt wrote:
> There were some NULL pointers dereferenced because DM was used
> too early without correct initialization.
This needs better explanation, really.
> This fixes commit 73172753f4f3 ("ARM: socfpga: Convert to DM serial")
>
> Signed-off-by: Simon Goldschmidt <simon.k.r.goldschm...@gmail.com>
> ---
>
> arch/arm/mach-socfpga/spl_gen5.c | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mach-socfpga/spl_gen5.c
> b/arch/arm/mach-socfpga/spl_gen5.c
> index d6fe7d35af..0d5526656d 100644
> --- a/arch/arm/mach-socfpga/spl_gen5.c
> +++ b/arch/arm/mach-socfpga/spl_gen5.c
> @@ -86,6 +86,7 @@ void board_init_f(ulong dummy)
> const struct cm_config *cm_default_cfg = cm_get_default_config();
> unsigned long sdram_size;
> unsigned long reg;
> + int ret;
>
> /*
> * First C code to run. Clear fake OCRAM ECC first as SBE
> @@ -152,6 +153,12 @@ void board_init_f(ulong dummy)
> /* unfreeze / thaw all IO banks */
> sys_mgr_frzctrl_thaw_req();
>
> + ret = spl_early_init();
> + if (ret) {
> + debug("spl_early_init() failed: %d\n", ret);
> + hang();
> + }
> +
> /* enable console uart printing */
> preloader_console_init();
>
> @@ -177,7 +184,4 @@ void board_init_f(ulong dummy)
> }
>
> socfpga_bridges_reset(1);
> -
> - /* Configure simple malloc base pointer into RAM. */
> - gd->malloc_base = CONFIG_SYS_TEXT_BASE + (1024 * 1024);
> }
>
--
Best regards,
Marek Vasut
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
