ppc4xx: Big cleanup of PPC4xx defines

[platform/kernel/u-boot.git] / board / amcc / walnut / flash.c

diff --git a/board/amcc/walnut/flash.c b/board/amcc/walnut/flash.c
index d363564..3dc6aab 100644 (file)
--- a/board/amcc/walnut/flash.c
+++ b/board/amcc/walnut/flash.c
@@ -102,27 +102,27 @@ 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;
                        pbcr =
                            (pbcr & 0x0001ffff) | base_b1 |
                            (((size_b1 / 1024 / 1024) - 1) << 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;
                        pbcr =
                            (pbcr & 0x0001ffff) | base_b0 |
                            (((size_b0 / 1024 / 1024) - 1) << 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]);