summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/cpu/mpc86xx
diff options
context:
space:
mode:
authorAndy Fleming <afleming@freescale.com>2012-10-23 19:03:46 -0500
committerAndy Fleming <afleming@freescale.com>2012-11-27 17:45:17 -0600
commite76cd5d4cf311da7d40adc5d6e9b425509cf0205 (patch)
tree36c37082482ef310e6419ce57b1b352edccdb29d /arch/powerpc/cpu/mpc86xx
parent66dc452bfe13b0e276adddf3997b9c5abc00115d (diff)
downloadblackbird-obmc-uboot-e76cd5d4cf311da7d40adc5d6e9b425509cf0205.tar.gz
blackbird-obmc-uboot-e76cd5d4cf311da7d40adc5d6e9b425509cf0205.zip
8xxx: Change all 8*xx_DDR addresses to 8xxx
There were a number of shared files that were using CONFIG_SYS_MPC85xx_DDR_ADDR, or CONFIG_SYS_MPC86xx_DDR_ADDR, and several variants (DDR2, DDR3). A recent patchset added 85xx-specific ones to code which was used by 86xx systems. After reviewing places where these constants were used, and noting that the type definitions of the pointers assigned to point to those addresses were the same, the cleanest approach to fixing this problem was to unify the namespace for the 85xx, 83xx, and 86xx DDR address definitions. This patch does: s/CONFIG_SYS_MPC8.xx_DDR/CONFIG_SYS_MPC8xxx_DDR/g All 85xx, 86xx, and 83xx have been built with this change. Signed-off-by: Andy Fleming <afleming@freescale.com> Tested-by: Andy Fleming <afleming@freescale.com> Acked-by: Kim Phillips <kim.phillips@freescale.com>
Diffstat (limited to 'arch/powerpc/cpu/mpc86xx')
-rw-r--r--arch/powerpc/cpu/mpc86xx/ddr-8641.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/cpu/mpc86xx/ddr-8641.c b/arch/powerpc/cpu/mpc86xx/ddr-8641.c
index b8f2c9387f..92ba26dc8e 100644
--- a/arch/powerpc/cpu/mpc86xx/ddr-8641.c
+++ b/arch/powerpc/cpu/mpc86xx/ddr-8641.c
@@ -22,10 +22,10 @@ void fsl_ddr_set_memctl_regs(const fsl_ddr_cfg_regs_t *regs,
switch (ctrl_num) {
case 0:
- ddr = (void *)CONFIG_SYS_MPC86xx_DDR_ADDR;
+ ddr = (void *)CONFIG_SYS_MPC8xxx_DDR_ADDR;
break;
case 1:
- ddr = (void *)CONFIG_SYS_MPC86xx_DDR2_ADDR;
+ ddr = (void *)CONFIG_SYS_MPC8xxx_DDR2_ADDR;
break;
default:
printf("%s unexpected ctrl_num = %u\n", __FUNCTION__, ctrl_num);
OpenPOWER on IntegriCloud