aboutsummaryrefslogtreecommitdiff
path: root/arch/powerpc/cpu/mpc85xx/ddr-gen1.c
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2012-11-28 08:30:21 -0700
committerTom Rini <trini@ti.com>2012-11-28 08:30:21 -0700
commita86fcff69519841aa1338efb1ace37ca77c16c35 (patch)
tree7b3de43c3bd829bb4375fec4e7f0d5f3d096b9f8 /arch/powerpc/cpu/mpc85xx/ddr-gen1.c
parentd41b3cc16fd97da23900f79e8fefdeedeebde8f6 (diff)
parentafbfdf545090472b734367ac2c874bfbe8928790 (diff)
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc85xx
Diffstat (limited to 'arch/powerpc/cpu/mpc85xx/ddr-gen1.c')
-rw-r--r--arch/powerpc/cpu/mpc85xx/ddr-gen1.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/ddr-gen1.c b/arch/powerpc/cpu/mpc85xx/ddr-gen1.c
index 54437dd0cb..8a86819fb5 100644
--- a/arch/powerpc/cpu/mpc85xx/ddr-gen1.c
+++ b/arch/powerpc/cpu/mpc85xx/ddr-gen1.c
@@ -18,7 +18,7 @@ void fsl_ddr_set_memctl_regs(const fsl_ddr_cfg_regs_t *regs,
unsigned int ctrl_num)
{
unsigned int i;
- volatile ccsr_ddr_t *ddr = (void *)CONFIG_SYS_MPC85xx_DDR_ADDR;
+ volatile ccsr_ddr_t *ddr = (void *)CONFIG_SYS_MPC8xxx_DDR_ADDR;
if (ctrl_num != 0) {
printf("%s unexpected ctrl_num = %u\n", __FUNCTION__, ctrl_num);
@@ -73,7 +73,7 @@ void fsl_ddr_set_memctl_regs(const fsl_ddr_cfg_regs_t *regs,
void
ddr_enable_ecc(unsigned int dram_size)
{
- volatile ccsr_ddr_t *ddr= (void *)(CONFIG_SYS_MPC85xx_DDR_ADDR);
+ volatile ccsr_ddr_t *ddr= (void *)(CONFIG_SYS_MPC8xxx_DDR_ADDR);
dma_meminit(CONFIG_MEM_INIT_VALUE, dram_size);