ppc4xx: Big cleanup of PPC4xx defines

[karo-tx-uboot.git] / board / esd / ocrtc / flash.c

diff --git a/board/esd/ocrtc/flash.c b/board/esd/ocrtc/flash.c
index e763a895ea4d37ebc3134a4ff7affc29cc937a67..eda7c5713c3a9c68ca78d2bcb33599391fa35302 100644 (file)
--- a/board/esd/ocrtc/flash.c
+++ b/board/esd/ocrtc/flash.c
@@ -68,9 +68,9 @@ unsigned long flash_init (void)
        /* Re-do sizing to get full correct info */
 
        if (size_b1) {
-               mtdcr (ebccfga, pb0cr);
-               pbcr = mfdcr (ebccfgd);
-               mtdcr (ebccfga, pb0cr);
+               mtdcr (EBC0_CFGADDR, PB0CR);
+               pbcr = mfdcr (EBC0_CFGDATA);
+               mtdcr (EBC0_CFGADDR, PB0CR);
                base_b1 = -size_b1;
                switch (size_b1) {
                case 1 << 20:
@@ -90,14 +90,14 @@ unsigned long flash_init (void)
                        break;
                }
                pbcr = (pbcr & 0x0001ffff) | base_b1 | (size_val << 17);
-               mtdcr (ebccfgd, pbcr);
-               /*          printf("pb1cr = %x\n", pbcr); */
+               mtdcr (EBC0_CFGDATA, pbcr);
+               /*          printf("PB1CR = %x\n", pbcr); */
        }
 
        if (size_b0) {
-               mtdcr (ebccfga, pb1cr);
-               pbcr = mfdcr (ebccfgd);
-               mtdcr (ebccfga, pb1cr);
+               mtdcr (EBC0_CFGADDR, PB1CR);
+               pbcr = mfdcr (EBC0_CFGDATA);
+               mtdcr (EBC0_CFGADDR, PB1CR);
                base_b0 = base_b1 - size_b0;
                switch (size_b1) {
                case 1 << 20:
@@ -117,8 +117,8 @@ unsigned long flash_init (void)
                        break;
                }
                pbcr = (pbcr & 0x0001ffff) | base_b0 | (size_val << 17);
-               mtdcr (ebccfgd, pbcr);
-               /*            printf("pb0cr = %x\n", pbcr); */
+               mtdcr (EBC0_CFGDATA, pbcr);
+               /*            printf("PB0CR = %x\n", pbcr); */
        }
 
        size_b0 = flash_get_size ((vu_long *) base_b0, &flash_info[0]);