X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=board%2Fep88x%2Fep88x.c;h=7e95007379f7e688c9e1c04b5dff75a215625bc8;hb=7a11c7f9747240dc770954d320569596c0fbcb50;hp=5f57f36bbf564605f4e7a0adb82eb9670cd5e379;hpb=f8edca2e9a128f526b1fe6f997f7adb852cf5b3c;p=u-boot

diff --git a/board/ep88x/ep88x.c b/board/ep88x/ep88x.c
index 5f57f36bbf..7e95007379 100644
--- a/board/ep88x/ep88x.c
+++ b/board/ep88x/ep88x.c
@@ -63,7 +63,7 @@ static uint sdram_table[] = {
 
 int board_early_init_f (void)
 {
-	vu_char *bcsr = (vu_char *)CFG_BCSR;
+	vu_char *bcsr = (vu_char *)CONFIG_SYS_BCSR;
 
 	bcsr[0] |= 0x0C; /* Turn the LEDs off */
 	bcsr[2] |= 0x08; /* Enable flash WE# line - necessary for
@@ -86,10 +86,10 @@ int board_early_init_f (void)
 	return 0;
 }
 
-long int initdram (int board_type)
+phys_size_t initdram (int board_type)
 {
 	long int msize;
-	volatile immap_t     *immap  = (volatile immap_t *)CFG_IMMR;
+	volatile immap_t     *immap  = (volatile immap_t *)CONFIG_SYS_IMMR;
 	volatile memctl8xx_t *memctl = &immap->im_memctl;
 
 	upmconfig(UPMA, sdram_table, sizeof(sdram_table) / sizeof(uint));
@@ -97,7 +97,7 @@ long int initdram (int board_type)
 	/* Configure SDRAM refresh */
 	memctl->memc_mptpr = MPTPR_PTP_DIV2; /* BRGCLK/2 */
 
-	memctl->memc_mamr = (65 << 24) | CFG_MAMR; /* No refresh */
+	memctl->memc_mamr = (65 << 24) | CONFIG_SYS_MAMR; /* No refresh */
 	udelay(100);
 
 	/* Run MRS pattern from location 0x36 */
@@ -106,10 +106,10 @@ long int initdram (int board_type)
 	udelay(100);
 
 	memctl->memc_mamr |=  MAMR_PTAE; /* Enable refresh */
-	memctl->memc_or1   = ~(CFG_SDRAM_MAX_SIZE - 1) | OR_CSNT_SAM;
-	memctl->memc_br1   =  CFG_SDRAM_BASE | BR_PS_32 | BR_MS_UPMA | BR_V;
+	memctl->memc_or1   = ~(CONFIG_SYS_SDRAM_MAX_SIZE - 1) | OR_CSNT_SAM;
+	memctl->memc_br1   =  CONFIG_SYS_SDRAM_BASE | BR_PS_32 | BR_MS_UPMA | BR_V;
 
-	msize = get_ram_size(CFG_SDRAM_BASE, CFG_SDRAM_MAX_SIZE);
+	msize = get_ram_size(CONFIG_SYS_SDRAM_BASE, CONFIG_SYS_SDRAM_MAX_SIZE);
 	memctl->memc_or1  |= ~(msize - 1);
 
 	return msize;
@@ -117,7 +117,7 @@ long int initdram (int board_type)
 
 int checkboard( void )
 {
-	vu_char *bcsr = (vu_char *)CFG_BCSR;
+	vu_char *bcsr = (vu_char *)CONFIG_SYS_BCSR;
 
 	puts("Board: ");
 	switch (bcsr[15]) {