[U-Boot] [PATCH-V3 1/2] omap3: Calculate CS1 size only when SDRC is initialized for CS1

[Hiremath, Vaibhav]

> -----Original Message-----
> From: Hiremath, Vaibhav
> Sent: Thursday, May 06, 2010 10:52 PM
> To: u-boot at lists.denx.de
> Cc: wd at denx.de; tom at bumblecow.com; Paulraj, Sandeep; Hiremath, Vaibhav;
> Premi, Sanjeev
> Subject: [PATCH-V3 1/2] omap3: Calculate CS1 size only when SDRC is
> initialized for CS1
> 
> From: Vaibhav Hiremath <hvaibhav at ti.com>
> 
> The patch makes sure that size for SDRC CS1 gets calculated
> only when the CS1 SDRC is initialized.
> 
[Hiremath, Vaibhav] Denk,

If we do not have any further comments, can we merge these patches?

Thanks,
Vaibhav

> Signed-off-by: Vaibhav Hiremath <hvaibhav at ti.com>
> Signed-off-by: Sanjeev Premi <premi at ti.com>
> ---
>  arch/arm/cpu/arm_cortexa8/omap3/board.c |    7 ++++---
>  1 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm/cpu/arm_cortexa8/omap3/board.c
> b/arch/arm/cpu/arm_cortexa8/omap3/board.c
> index 7b78fa4..69a08fd 100644
> --- a/arch/arm/cpu/arm_cortexa8/omap3/board.c
> +++ b/arch/arm/cpu/arm_cortexa8/omap3/board.c
> @@ -282,6 +282,8 @@ int dram_init(void)
>  	DECLARE_GLOBAL_DATA_PTR;
>  	unsigned int size0 = 0, size1 = 0;
> 
> +	size0 = get_sdr_cs_size(CS0);
> +
>  	/*
>  	 * If a second bank of DDR is attached to CS1 this is
>  	 * where it can be started.  Early init code will init
> @@ -290,10 +292,9 @@ int dram_init(void)
>  	if ((sysinfo.mtype == DDR_COMBO) || (sysinfo.mtype == DDR_STACKED)) {
>  		do_sdrc_init(CS1, NOT_EARLY);
>  		make_cs1_contiguous();
> -	}
> 
> -	size0 = get_sdr_cs_size(CS0);
> -	size1 = get_sdr_cs_size(CS1);
> +		size1 = get_sdr_cs_size(CS1);
> +	}
> 
>  	gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
>  	gd->bd->bi_dram[0].size = size0;
> --
> 1.6.2.4