Merge branch 'fixes' into cleanups

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

diff --git a/board/esd/ash405/flash.c b/board/esd/ash405/flash.c
index f904affc4f60d624978f957a6e9b55f2d53b1684..274ada9fe5c235de15a9b4ec073572a5893f32f7 100644 (file)
--- a/board/esd/ash405/flash.c
+++ b/board/esd/ash405/flash.c
@@ -43,12 +43,12 @@ unsigned long flash_init (void)
 {
        unsigned long size_b0;
        int i;
-        uint pbcr;
-        unsigned long base_b0;
+       uint pbcr;
+       unsigned long base_b0;
        int size_val = 0;
 
        /* 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;
        }
 
@@ -61,14 +61,14 @@ unsigned long flash_init (void)
                        size_b0, size_b0<<20);
        }
 
-        /* Setup offsets */
-        flash_get_offsets (-size_b0, &flash_info[0]);
+       /* Setup offsets */
+       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);
-        base_b0 = -size_b0;
+       /* Re-do sizing to get full correct info */
+       mtdcr(ebccfga, pb0cr);
+       pbcr = mfdcr(ebccfgd);
+       mtdcr(ebccfga, pb0cr);
+       base_b0 = -size_b0;
        switch (size_b0) {
        case 1 << 20:
                size_val = 0;
@@ -87,15 +87,15 @@ unsigned long flash_init (void)
                break;
        }
        pbcr = (pbcr & 0x0001ffff) | base_b0 | (size_val << 17);
-        mtdcr(ebccfgd, pbcr);
+       mtdcr(ebccfgd, pbcr);
 
-        /* Monitor protection ON by default */
-        (void)flash_protect(FLAG_PROTECT_SET,
-                            -CFG_MONITOR_LEN,
-                            0xffffffff,
-                            &flash_info[0]);
+       /* Monitor protection ON by default */
+       (void)flash_protect(FLAG_PROTECT_SET,
+                           -CONFIG_SYS_MONITOR_LEN,
+                           0xffffffff,
+                           &flash_info[0]);
 
-        flash_info[0].size = size_b0;
+       flash_info[0].size = size_b0;
 
        return (size_b0);
 }