ppc4xx: Big cleanup of PPC4xx defines

[platform/kernel/u-boot.git] / board / esd / cpci2dp / flash.c

diff --git a/board/esd/cpci2dp/flash.c b/board/esd/cpci2dp/flash.c
index de847f9..224dde4 100644 (file)
--- a/board/esd/cpci2dp/flash.c
+++ b/board/esd/cpci2dp/flash.c
@@ -47,7 +47,7 @@ unsigned long flash_init (void)
        unsigned long base_b0;
 
        /* Init: no FLASHes known */
-       for (i=0; i<CFG_MAX_FLASH_BANKS; ++i) {
+       for (i=0; i<CONFIG_SYS_MAX_FLASH_BANKS; ++i) {
                flash_info[i].flash_id = FLASH_UNKNOWN;
        }
 
@@ -64,13 +64,13 @@ unsigned long flash_init (void)
        flash_get_offsets (-size_b0, &flash_info[0]);
 
        /* Re-do sizing to get full correct info */
-       mtdcr(ebccfga, pb0cr);
-       pbcr = mfdcr(ebccfgd);
-       mtdcr(ebccfga, pb0cr);
+       mtdcr(EBC0_CFGADDR, PB0CR);
+       pbcr = mfdcr(EBC0_CFGDATA);
+       mtdcr(EBC0_CFGADDR, PB0CR);
        base_b0 = -size_b0;
        pbcr = (pbcr & 0x0001ffff) | base_b0 | (((size_b0/1024/1024)-1)<<17);
-       mtdcr(ebccfgd, pbcr);
-       /*          printf("pb1cr = %x\n", pbcr); */
+       mtdcr(EBC0_CFGDATA, pbcr);
+       /*          printf("PB1CR = %x\n", pbcr); */
 
        /* Monitor protection ON by default */
        (void)flash_protect(FLAG_PROTECT_SET,