diff options
| author | Tom Rini <trini@ti.com> | 2012-11-28 08:30:21 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-11-28 08:30:21 -0700 |
| commit | a86fcff69519841aa1338efb1ace37ca77c16c35 (patch) | |
| tree | 7b3de43c3bd829bb4375fec4e7f0d5f3d096b9f8 /arch/powerpc/cpu/mpc85xx/ddr-gen2.c | |
| parent | d41b3cc16fd97da23900f79e8fefdeedeebde8f6 (diff) | |
| parent | afbfdf545090472b734367ac2c874bfbe8928790 (diff) | |
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc85xx
Diffstat (limited to 'arch/powerpc/cpu/mpc85xx/ddr-gen2.c')
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/ddr-gen2.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/ddr-gen2.c b/arch/powerpc/cpu/mpc85xx/ddr-gen2.c index 49000a19e8..a705862522 100644 --- a/arch/powerpc/cpu/mpc85xx/ddr-gen2.c +++ b/arch/powerpc/cpu/mpc85xx/ddr-gen2.c @@ -19,15 +19,12 @@ void fsl_ddr_set_memctl_regs(const fsl_ddr_cfg_regs_t *regs, unsigned int ctrl_num) { unsigned int i; -#ifdef CONFIG_MPC83xx - ccsr_ddr_t *ddr = (void *)CONFIG_SYS_MPC83xx_DDR_ADDR; -#else - ccsr_ddr_t *ddr = (void *)CONFIG_SYS_MPC85xx_DDR_ADDR; -#ifdef CONFIG_SYS_FSL_ERRATUM_NMG_DDR120 + ccsr_ddr_t *ddr = (void *)CONFIG_SYS_MPC8xxx_DDR_ADDR; + +#if defined(CONFIG_SYS_FSL_ERRATUM_NMG_DDR120) && defined(CONFIG_MPC85xx) ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); uint svr; #endif -#endif if (ctrl_num) { printf("%s unexpected ctrl_num = %u\n", __FUNCTION__, ctrl_num); |