diff options
| author | Tom Rini <trini@ti.com> | 2012-11-26 14:53:33 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-11-26 14:53:33 -0700 |
| commit | dfe161032d007e4901064ab36b58f054126b1f35 (patch) | |
| tree | 5389a370fbb7cfcf070669a0dc190fc765a3c985 /arch/powerpc/cpu/mpc85xx/cpu.c | |
| parent | d6bc7dcc0347765c4621c253ea68b07985d8c1f0 (diff) | |
| parent | 3287f6d3858faee768a7c47515bd21914ad591a2 (diff) | |
| download | u-boot-imx-dfe161032d007e4901064ab36b58f054126b1f35.zip u-boot-imx-dfe161032d007e4901064ab36b58f054126b1f35.tar.gz u-boot-imx-dfe161032d007e4901064ab36b58f054126b1f35.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
Diffstat (limited to 'arch/powerpc/cpu/mpc85xx/cpu.c')
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/cpu.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c index db232e6..78486aa 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu.c +++ b/arch/powerpc/cpu/mpc85xx/cpu.c @@ -332,7 +332,8 @@ 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) +#if (defined(CONFIG_SYS_RAMBOOT) || defined(CONFIG_SPL)) && \ + !defined(CONFIG_SYS_INIT_L2_ADDR) phys_size_t initdram(int board_type) { #if defined(CONFIG_SPD_EEPROM) || defined(CONFIG_DDR_SPD) |