Merge branch 'master' of git://git.denx.de/u-boot-ti

[oweals/u-boot.git] / board / esd / dasa_sim / flash.c

diff --git a/board/esd/dasa_sim/flash.c b/board/esd/dasa_sim/flash.c
index 32cd64cf0883c4fcceca7ec31fae86b88d28ec02..9c71b043cbf13a1e705061115606fe73bdda98fd 100644 (file)
--- a/board/esd/dasa_sim/flash.c
+++ b/board/esd/dasa_sim/flash.c
@@ -43,11 +43,11 @@ static void flash_get_offsets (ulong base, flash_info_t *info);
 unsigned long flash_init (void)
 {
        unsigned long size_b0;
-        int i;
-        unsigned long base_b0;
+       int i;
+       unsigned long base_b0;
 
        /* 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;
        }
 
@@ -60,18 +60,18 @@ 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]);
 
-        base_b0 = -size_b0;
+       base_b0 = -size_b0;
 
-        /* Monitor protection ON by default */
-        (void)flash_protect(FLAG_PROTECT_SET,
-                            -monitor_flash_len,
-                            0xffffffff,
-                            &flash_info[0]);
+       /* Monitor protection ON by default */
+       (void)flash_protect(FLAG_PROTECT_SET,
+                           -monitor_flash_len,
+                           0xffffffff,
+                           &flash_info[0]);
 
-        flash_info[0].size = size_b0;
+       flash_info[0].size = size_b0;
 
        return (size_b0);
 }