]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
Kirkwood: bugfix: DRAM size initialization
authorTanmay Upadhyay <[tanmay.upadhyay@einfochips.com]>
Thu, 28 Oct 2010 14:36:22 +0000 (20:06 +0530)
committerPrafulla Wadaskar <prafulla@marvell.com>
Thu, 28 Oct 2010 14:36:22 +0000 (20:06 +0530)
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>
arch/arm/cpu/arm926ejs/kirkwood/dram.c

index 7439c87f681070cb3ab24c615afcf8642bbb6ca7..a4344b82968d76952c2bb0056c9540a63e875e68 100644 (file)
@@ -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;
 }