diff options
author | Wolfgang Denk <wd@denx.de> | 2011-04-10 21:24:40 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2011-04-10 21:24:40 +0200 |
commit | 17e967b3dfcc0616a135700a2c39287943ffb958 (patch) | |
tree | 5af8e32aefa1073c18e70b3ed048e42b0eac8534 /arch/powerpc/cpu/mpc85xx/cpu.c | |
parent | 4fd783d63f85871db03b1f06a2572bf43085af32 (diff) | |
parent | c1c087b753633305a0d656a7b4d65d788f4bfb68 (diff) | |
download | u-boot-imx-17e967b3dfcc0616a135700a2c39287943ffb958.zip u-boot-imx-17e967b3dfcc0616a135700a2c39287943ffb958.tar.gz u-boot-imx-17e967b3dfcc0616a135700a2c39287943ffb958.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'arch/powerpc/cpu/mpc85xx/cpu.c')
-rw-r--r-- | arch/powerpc/cpu/mpc85xx/cpu.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c index 49ea6cc..f5b39c0 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu.c +++ b/arch/powerpc/cpu/mpc85xx/cpu.c @@ -299,6 +299,16 @@ void mpc85xx_reginfo(void) /* Common ddr init for non-corenet fsl 85xx platforms */ #ifndef CONFIG_FSL_CORENET +#if defined(CONFIG_SYS_RAMBOOT) && !defined(CONFIG_SYS_INIT_L2_ADDR) +phys_size_t initdram(int board_type) +{ +#if defined(CONFIG_SPD_EEPROM) || defined(CONFIG_DDR_SPD) + return fsl_ddr_sdram_size(); +#else + return CONFIG_SYS_SDRAM_SIZE * 1024 * 1024; +#endif +} +#else /* CONFIG_SYS_RAMBOOT */ phys_size_t initdram(int board_type) { phys_size_t dram_size = 0; @@ -348,6 +358,7 @@ phys_size_t initdram(int board_type) puts("DDR: "); return dram_size; } +#endif /* CONFIG_SYS_RAMBOOT */ #endif #if CONFIG_POST & CONFIG_SYS_POST_MEMORY |