ppc4xx: Big cleanup of PPC4xx defines

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

diff --git a/board/esd/du405/flash.c b/board/esd/du405/flash.c
index 97d8322..c62c6a9 100644 (file)
--- a/board/esd/du405/flash.c
+++ b/board/esd/du405/flash.c
@@ -47,7 +47,7 @@ unsigned long flash_init (void)
        unsigned long base_b0, base_b1;
 
        /* 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;
        }
 
@@ -67,25 +67,25 @@ 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]);
@@ -94,7 +94,7 @@ unsigned long flash_init (void)
 
        /* monitor protection ON by default */
        flash_protect (FLAG_PROTECT_SET,
-                       base_b0 + size_b0 - CFG_MONITOR_LEN,
+                       base_b0 + size_b0 - monitor_flash_len,
                        base_b0 + size_b0 - 1, &flash_info[0]);
 
        if (size_b1) {
@@ -105,11 +105,11 @@ unsigned long flash_init (void)
 
                /* monitor protection ON by default */
                flash_protect (FLAG_PROTECT_SET,
-                               base_b1 + size_b1 - CFG_MONITOR_LEN,
+                               base_b1 + size_b1 - monitor_flash_len,
                                base_b1 + size_b1 - 1, &flash_info[1]);
                /* monitor protection OFF by default (one is enough) */
                flash_protect (FLAG_PROTECT_CLEAR,
-                               base_b0 + size_b0 - CFG_MONITOR_LEN,
+                               base_b0 + size_b0 - monitor_flash_len,
                                base_b0 + size_b0 - 1, &flash_info[0]);
        } else {
                flash_info[1].flash_id = FLASH_UNKNOWN;