[U-Boot,3/6] arm: socfpga: spl_gen5: clean up malloc_base assignment

Message ID 20180809190420.28093-4-simon.k.r.goldschmidt@gmail.com
State Superseded
Delegated to: Marek Vasut
Headers show
Series
  • Get socfpga gen5 SPL working again.
Related show

Commit Message

Simon Goldschmidt Aug. 9, 2018, 7:04 p.m.
From: Simon Goldschmidt <sgoldschmidt@de.pepperl-fuchs.com>

In spl_gen5's board_init_f(), gd->malloc_base is manually assigned
at the end of the function to point to sdram.  This code is outdated
as by now, the heap is switched to sdram by the common function
spl_relocate_stack_gd() if the appropriate defines are set.

As it was, the value assigned manually was directly overwritten by
this common code, so remove the manual assignment.

Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
---
v2:
- this patch is new in v2 of the series (extracted from PATCH v1 1/6)

 arch/arm/mach-socfpga/spl_gen5.c | 3 ---
 1 file changed, 3 deletions(-)

Comments

Marek Vasut Aug. 9, 2018, 9:43 p.m. | #1
On 08/09/2018 09:04 PM, Simon Goldschmidt wrote:
> From: Simon Goldschmidt <sgoldschmidt@de.pepperl-fuchs.com>
> 
> In spl_gen5's board_init_f(), gd->malloc_base is manually assigned
> at the end of the function to point to sdram.  This code is outdated
> as by now, the heap is switched to sdram by the common function
> spl_relocate_stack_gd() if the appropriate defines are set.
> 
> As it was, the value assigned manually was directly overwritten by
> this common code, so remove the manual assignment.
> 
> Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
> ---
> v2:
> - this patch is new in v2 of the series (extracted from PATCH v1 1/6)
> 
>  arch/arm/mach-socfpga/spl_gen5.c | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/arch/arm/mach-socfpga/spl_gen5.c b/arch/arm/mach-socfpga/spl_gen5.c
> index 9bdfaa3c1e..0d5526656d 100644
> --- a/arch/arm/mach-socfpga/spl_gen5.c
> +++ b/arch/arm/mach-socfpga/spl_gen5.c
> @@ -184,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);
>  }
> 
I like this patch :)

Patch

diff --git a/arch/arm/mach-socfpga/spl_gen5.c b/arch/arm/mach-socfpga/spl_gen5.c
index 9bdfaa3c1e..0d5526656d 100644
--- a/arch/arm/mach-socfpga/spl_gen5.c
+++ b/arch/arm/mach-socfpga/spl_gen5.c
@@ -184,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);
 }