diff options
author | Wolfgang Denk <wd@denx.de> | 2010-10-29 22:03:00 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2010-10-29 22:03:00 +0200 |
commit | 0c0892be0d93a5a892b93739c5eb3bf692fed4ff (patch) | |
tree | a046b11024bdf0a41082647c95df23a10cb206fc /arch | |
parent | d75c2a3d7f34ff1eb9920ad72483cff7cb6d358f (diff) | |
parent | 28e57108a61bd0e554d9847170b8ad9dad093e07 (diff) | |
download | u-boot-imx-0c0892be0d93a5a892b93739c5eb3bf692fed4ff.zip u-boot-imx-0c0892be0d93a5a892b93739c5eb3bf692fed4ff.tar.gz u-boot-imx-0c0892be0d93a5a892b93739c5eb3bf692fed4ff.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-marvell
Conflicts:
include/configs/km_arm.h
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/cpu/arm926ejs/kirkwood/dram.c | 10 |
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 342afe9..2441554 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; } |