summaryrefslogtreecommitdiffstats
path: root/arch/arm/cpu/arm926ejs
diff options
context:
space:
mode:
authorTanmay Upadhyay <[tanmay.upadhyay@einfochips.com]>2010-10-28 20:06:22 +0530
committerPrafulla Wadaskar <prafulla@marvell.com>2010-10-28 20:06:22 +0530
commit28e57108a61bd0e554d9847170b8ad9dad093e07 (patch)
tree85f4238317b8f6b4fd043bca5a2b7de753a0b5b9 /arch/arm/cpu/arm926ejs
parent31d80c77ff672e0202b4ada5215c4666c949ffc2 (diff)
downloadblackbird-obmc-uboot-28e57108a61bd0e554d9847170b8ad9dad093e07.tar.gz
blackbird-obmc-uboot-28e57108a61bd0e554d9847170b8ad9dad093e07.zip
Kirkwood: bugfix: DRAM size initialization
If start of any DRAM bank is greater than total DDR size, remaining DDR banks' start address & size were left un-initialized in dram_init function. This could break other functions who uses array 'gd->bd->bi_dram'. Kirkwood network driver is one example. This also stops Linux kernel from booting. v2 - Set start address also to 0. Without this Linux kernel couldn't boot up Signed-off-by: Tanmay Upadhyay <tanmay.upadhyay@einfochips.com>
Diffstat (limited to 'arch/arm/cpu/arm926ejs')
-rw-r--r--arch/arm/cpu/arm926ejs/kirkwood/dram.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/cpu/arm926ejs/kirkwood/dram.c b/arch/arm/cpu/arm926ejs/kirkwood/dram.c
index 7439c87f68..a4344b8296 100644
--- a/arch/arm/cpu/arm926ejs/kirkwood/dram.c
+++ b/arch/arm/cpu/arm926ejs/kirkwood/dram.c
@@ -81,6 +81,16 @@ int dram_init(void)
gd->ram_size += gd->bd->bi_dram[i].size;
}
+
+ for (; i < CONFIG_NR_DRAM_BANKS; i++) {
+ /* If above loop terminated prematurely, we need to set
+ * remaining banks' start address & size as 0. Otherwise other
+ * u-boot functions and Linux kernel gets wrong values which
+ * could result in crash */
+ gd->bd->bi_dram[i].start = 0;
+ gd->bd->bi_dram[i].size = 0;
+ }
+
return 0;
}
OpenPOWER on IntegriCloud