rename CFG_ macros to CONFIG_SYS

[u-boot] / board / esd / cpci405 / flash.c

diff --git a/board/esd/cpci405/flash.c b/board/esd/cpci405/flash.c
index 85a9edc338fd34bc3095919c8a8a95fe31c8f2fd..d535924f86fa1460cbe84b8c53e6081ca72f31a4 100644 (file)
--- a/board/esd/cpci405/flash.c
+++ b/board/esd/cpci405/flash.c
@@ -66,7 +66,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;
        }
 
@@ -86,11 +86,11 @@ unsigned long flash_init (void)
        /* Re-do sizing to get full correct info */
 
        if (size_b1) {
-               base_b1 = -size_b1;
                if (size_b1 < (1 << 20)) {
                        /* minimum CS size on PPC405GP is 1MB !!! */
                        size_b1 = 1 << 20;
                }
+               base_b1 = -size_b1;
                mtdcr (ebccfga, pb0cr);
                pbcr = mfdcr (ebccfgd);
                mtdcr (ebccfga, pb0cr);
@@ -103,11 +103,11 @@ unsigned long flash_init (void)
        }
 
        if (size_b0) {
-               base_b0 = base_b1 - size_b0;
                if (size_b0 < (1 << 20)) {
                        /* minimum CS size on PPC405GP is 1MB !!! */
                        size_b0 = 1 << 20;
                }
+               base_b0 = base_b1 - size_b0;
                mtdcr (ebccfga, pb1cr);
                pbcr = mfdcr (ebccfgd);
                mtdcr (ebccfga, pb1cr);
@@ -125,7 +125,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) {
@@ -136,11 +136,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;