diff options
Diffstat (limited to 'arch/powerpc/cpu/mpc85xx/cpu.c')
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/cpu.c | 16 | 
1 files changed, 8 insertions, 8 deletions
| diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c index 1a0196c7c..552acc687 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu.c +++ b/arch/powerpc/cpu/mpc85xx/cpu.c @@ -22,7 +22,7 @@  #include <asm/fsl_lbc.h>  #include <post.h>  #include <asm/processor.h> -#include <asm/fsl_ddr_sdram.h> +#include <fsl_ddr_sdram.h>  DECLARE_GLOBAL_DATA_PTR; @@ -453,21 +453,21 @@ static void dump_spd_ddr_reg(void)  	for (i = 0; i < CONFIG_NUM_DDR_CONTROLLERS; i++) {  		switch (i) {  		case 0: -			ddr[i] = (void *)CONFIG_SYS_MPC8xxx_DDR_ADDR; +			ddr[i] = (void *)CONFIG_SYS_FSL_DDR_ADDR;  			break; -#if defined(CONFIG_SYS_MPC8xxx_DDR2_ADDR) && (CONFIG_NUM_DDR_CONTROLLERS > 1) +#if defined(CONFIG_SYS_FSL_DDR2_ADDR) && (CONFIG_NUM_DDR_CONTROLLERS > 1)  		case 1: -			ddr[i] = (void *)CONFIG_SYS_MPC8xxx_DDR2_ADDR; +			ddr[i] = (void *)CONFIG_SYS_FSL_DDR2_ADDR;  			break;  #endif -#if defined(CONFIG_SYS_MPC8xxx_DDR3_ADDR) && (CONFIG_NUM_DDR_CONTROLLERS > 2) +#if defined(CONFIG_SYS_FSL_DDR3_ADDR) && (CONFIG_NUM_DDR_CONTROLLERS > 2)  		case 2: -			ddr[i] = (void *)CONFIG_SYS_MPC8xxx_DDR3_ADDR; +			ddr[i] = (void *)CONFIG_SYS_FSL_DDR3_ADDR;  			break;  #endif -#if defined(CONFIG_SYS_MPC8xxx_DDR4_ADDR) && (CONFIG_NUM_DDR_CONTROLLERS > 3) +#if defined(CONFIG_SYS_FSL_DDR4_ADDR) && (CONFIG_NUM_DDR_CONTROLLERS > 3)  		case 3: -			ddr[i] = (void *)CONFIG_SYS_MPC8xxx_DDR4_ADDR; +			ddr[i] = (void *)CONFIG_SYS_FSL_DDR4_ADDR;  			break;  #endif  		default: |