rename CFG_ENV_IS_IN_FLASH in CONFIG_ENV_IS_IN_FLASH

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

diff --git a/board/atc/flash.c b/board/atc/flash.c
index 7e97182..9e4c6c5 100644 (file)
--- a/board/atc/flash.c
+++ b/board/atc/flash.c
@@ -76,14 +76,14 @@ unsigned long flash_init (void)
 
                memset(&flash_info[i], 0, sizeof(flash_info_t));
 
-               flash_info[i].size = 
+               flash_info[i].size =
                        flash_get_size((FPW *)flashbase, &flash_info[i]);
 
                if (flash_info[i].flash_id == FLASH_UNKNOWN) {
                        printf ("## Unknown FLASH on Bank %d - Size = 0x%08lx\n",
                        i, flash_info[i].size);
                }
-               
+
                size += flash_info[i].size;
        }
 
@@ -91,11 +91,11 @@ unsigned long flash_init (void)
        /* monitor protection ON by default */
        flash_protect(FLAG_PROTECT_SET,
                      CFG_MONITOR_BASE,
-                     CFG_MONITOR_BASE+CFG_MONITOR_LEN-1,
+                     CFG_MONITOR_BASE+monitor_flash_len-1,
                      flash_get_info(CFG_MONITOR_BASE));
 #endif
 
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
        flash_protect(FLAG_PROTECT_SET,
                      CFG_ENV_ADDR,
@@ -163,13 +163,13 @@ static flash_info_t *flash_get_info(ulong base)
 {
        int i;
        flash_info_t * info;
-       
+
        for (i = 0; i < CFG_MAX_FLASH_BANKS; i ++) {
                info = & flash_info[i];
                if (info->start[0] <= base && base < info->start[0] + info->size)
                        break;
        }
-       
+
        return i == CFG_MAX_FLASH_BANKS ? 0 : info;
 }
 
@@ -181,7 +181,7 @@ void flash_print_info (flash_info_t *info)
        int i;
        uchar *boottype;
        uchar *bootletter;
-       uchar *fmt;
+       char *fmt;
        uchar botbootletter[] = "B";
        uchar topbootletter[] = "T";
        uchar botboottype[] = "bottom boot sector";
@@ -216,32 +216,32 @@ void flash_print_info (flash_info_t *info)
        case FLASH_AM640U:
                fmt = "29LV641D (64 Mbit, uniform sectors)\n";
                break;
-        case FLASH_28F800C3B:
-        case FLASH_28F800C3T:
+       case FLASH_28F800C3B:
+       case FLASH_28F800C3T:
                fmt = "28F800C3%s (8 Mbit, %s)\n";
                break;
        case FLASH_INTEL800B:
        case FLASH_INTEL800T:
                fmt = "28F800B3%s (8 Mbit, %s)\n";
                break;
-        case FLASH_28F160C3B:
-        case FLASH_28F160C3T:
+       case FLASH_28F160C3B:
+       case FLASH_28F160C3T:
                fmt = "28F160C3%s (16 Mbit, %s)\n";
                break;
        case FLASH_INTEL160B:
        case FLASH_INTEL160T:
                fmt = "28F160B3%s (16 Mbit, %s)\n";
                break;
-        case FLASH_28F320C3B:
-        case FLASH_28F320C3T:
+       case FLASH_28F320C3B:
+       case FLASH_28F320C3T:
                fmt = "28F320C3%s (32 Mbit, %s)\n";
                break;
        case FLASH_INTEL320B:
        case FLASH_INTEL320T:
                fmt = "28F320B3%s (32 Mbit, %s)\n";
                break;
-        case FLASH_28F640C3B:
-        case FLASH_28F640C3T:
+       case FLASH_28F640C3B:
+       case FLASH_28F640C3T:
                fmt = "28F640C3%s (64 Mbit, %s)\n";
                break;
        case FLASH_INTEL640B: