[U-Boot] [PATCH v2 3/4] arm: imx: m53evk: remove usage of mx53_dram_size

[Marek Vasut]

On 12/18/2017 10:02 AM, linux-kernel-dev at beckhoff.com wrote:
> From: Patrick Bruenn <p.bruenn at beckhoff.com>
> 
> Static variables are not available during board_init_f().

They are, since the board runs from RAM at that point already.

> 'static uint32_t mx53_dram_size[2];' was used in board specific
> dram_init(), dram_init_banksize() and get_effective_memsize() to avoid
> multiple calls to get_ram_size().
> 
> Reused dram initialization functions from arch/arm/mach-imx/mx5/mx53_dram.c
> 
> Signed-off-by: Patrick Bruenn <p.bruenn at beckhoff.com>
> 
> ---
> 
> Changes in v2: None
> 
> 
> Only compile tested with make m53evk_defconfig

Are you sure this patch retains the original functionality ? Note the
warning ...

> ---
>  arch/arm/mach-imx/mx5/Makefile |  1 +
>  board/aries/m53evk/m53evk.c    | 39 ---------------------------------------
>  2 files changed, 1 insertion(+), 39 deletions(-)
> 
> diff --git a/arch/arm/mach-imx/mx5/Makefile b/arch/arm/mach-imx/mx5/Makefile
> index 368cfde98b..2cc2cbc07a 100644
> --- a/arch/arm/mach-imx/mx5/Makefile
> +++ b/arch/arm/mach-imx/mx5/Makefile
> @@ -11,4 +11,5 @@ obj-y := soc.o clock.o
>  obj-y += lowlevel_init.o
>  
>  # common files for mx53 dram initialization
> +obj-$(CONFIG_TARGET_M53EVK)     += mx53_dram.o
>  obj-$(CONFIG_TARGET_MX53CX9020) += mx53_dram.o
> diff --git a/board/aries/m53evk/m53evk.c b/board/aries/m53evk/m53evk.c
> index ece8957aaf..a798d83376 100644
> --- a/board/aries/m53evk/m53evk.c
> +++ b/board/aries/m53evk/m53evk.c
> @@ -31,45 +31,6 @@
>  
>  DECLARE_GLOBAL_DATA_PTR;
>  
> -static uint32_t mx53_dram_size[2];
> -
> -phys_size_t get_effective_memsize(void)
> -{
> -	/*
> -	 * WARNING: We must override get_effective_memsize() function here
> -	 * to report only the size of the first DRAM bank. This is to make
> -	 * U-Boot relocator place U-Boot into valid memory, that is, at the
> -	 * end of the first DRAM bank. If we did not override this function
> -	 * like so, U-Boot would be placed at the address of the first DRAM
> -	 * bank + total DRAM size - sizeof(uboot), which in the setup where
> -	 * each DRAM bank contains 512MiB of DRAM would result in placing
> -	 * U-Boot into invalid memory area close to the end of the first
> -	 * DRAM bank.
> -	 */
> -	return mx53_dram_size[0];
> -}
> -
> -int dram_init(void)
> -{
> -	mx53_dram_size[0] = get_ram_size((void *)PHYS_SDRAM_1, 1 << 30);
> -	mx53_dram_size[1] = get_ram_size((void *)PHYS_SDRAM_2, 1 << 30);
> -
> -	gd->ram_size = mx53_dram_size[0] + mx53_dram_size[1];
> -
> -	return 0;
> -}
> -
> -int dram_init_banksize(void)
> -{
> -	gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
> -	gd->bd->bi_dram[0].size = mx53_dram_size[0];
> -
> -	gd->bd->bi_dram[1].start = PHYS_SDRAM_2;
> -	gd->bd->bi_dram[1].size = mx53_dram_size[1];
> -
> -	return 0;
> -}
> -
>  static void setup_iomux_uart(void)
>  {
>  	static const iomux_v3_cfg_t uart_pads[] = {
> 


-- 
Best regards,
Marek Vasut