summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorVaibhav Hiremath <hvaibhav@ti.com>2010-06-07 15:20:29 -0400
committerTom <Tom@bumblecow.com>2010-06-08 10:07:18 -0500
commitd11212e3772c8fe43a1f487bbf58f3341118a241 (patch)
tree009a03055c6cf8bfb39179294fe91faf3d1785a7 /arch
parent675e0eaf0f0429aac3c6fb41634fbcea2350fe49 (diff)
downloadu-boot-imx-d11212e3772c8fe43a1f487bbf58f3341118a241.zip
u-boot-imx-d11212e3772c8fe43a1f487bbf58f3341118a241.tar.gz
u-boot-imx-d11212e3772c8fe43a1f487bbf58f3341118a241.tar.bz2
omap3: Calculate CS1 size only when SDRC is
initialized for CS1 From: Vaibhav Hiremath <hvaibhav@ti.com> The patch makes sure that size for SDRC CS1 gets calculated only when the CS1 SDRC is initialized. Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/cpu/arm_cortexa8/omap3/board.c7
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;