aboutsummaryrefslogtreecommitdiffstats
path: root/board/socrates
diff options
context:
space:
mode:
Diffstat (limited to 'board/socrates')
-rw-r--r--board/socrates/sdram.c2
-rw-r--r--board/socrates/socrates.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/board/socrates/sdram.c b/board/socrates/sdram.c
index d358a209a4a..04527cf79ab 100644
--- a/board/socrates/sdram.c
+++ b/board/socrates/sdram.c
@@ -26,7 +26,7 @@
phys_size_t fixed_sdram(void)
{
struct ccsr_ddr __iomem *ddr =
- (struct ccsr_ddr __iomem *)(CONFIG_SYS_FSL_DDR_ADDR);
+ (struct ccsr_ddr __iomem *)(CFG_SYS_FSL_DDR_ADDR);
/*
* Disable memory controller.
diff --git a/board/socrates/socrates.c b/board/socrates/socrates.c
index 33b72614d76..eaba87542e7 100644
--- a/board/socrates/socrates.c
+++ b/board/socrates/socrates.c
@@ -35,7 +35,7 @@ ulong flash_get_size (ulong base, int banknum);
int checkboard (void)
{
- volatile ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
+ volatile ccsr_gur_t *gur = (void *)(CFG_SYS_MPC85xx_GUTS_ADDR);
char buf[64];
int f;
int i = env_get_f("serial#", buf, sizeof(buf));
@@ -139,7 +139,7 @@ int misc_init_r (void)
void local_bus_init (void)
{
volatile fsl_lbc_t *lbc = LBC_BASE_ADDR;
- volatile ccsr_local_ecm_t *ecm = (void *)(CONFIG_SYS_MPC85xx_ECM_ADDR);
+ volatile ccsr_local_ecm_t *ecm = (void *)(CFG_SYS_MPC85xx_ECM_ADDR);
sys_info_t sysinfo;
uint clkdiv;
uint lbc_mhz;
@@ -175,7 +175,7 @@ void local_bus_init (void)
#ifdef CONFIG_BOARD_EARLY_INIT_R
int board_early_init_r (void)
{
- volatile ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
+ volatile ccsr_gur_t *gur = (void *)(CFG_SYS_MPC85xx_GUTS_ADDR);
/* set and reset the GPIO pin 2 which will reset the W83782G chip */
out_8((unsigned char*)&gur->gpoutdr, 0x3F );