rename CFG_ENV macros to CONFIG_ENV

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

diff --git a/board/smdk2400/flash.c b/board/smdk2400/flash.c
index c4d6bae..af46bf6 100644 (file)
--- a/board/smdk2400/flash.c
+++ b/board/smdk2400/flash.c
@@ -76,7 +76,7 @@ ulong flash_init (void)
                flash_info[i].sector_count = CFG_MAX_FLASH_SECT;
                memset (flash_info[i].protect, 0, CFG_MAX_FLASH_SECT);
                if (i == 0)
-                       flashbase = PHYS_FLASH_1;
+                       flashbase = CFG_FLASH_BASE;
                else
                        panic ("configured too many flash banks!\n");
                for (j = 0; j < flash_info[i].sector_count; j++) {
@@ -93,17 +93,17 @@ ulong flash_init (void)
         */
        flash_protect ( FLAG_PROTECT_SET,
                        CFG_FLASH_BASE,
-                       CFG_FLASH_BASE + _armboot_end_data - _armboot_start,
+                       CFG_FLASH_BASE + monitor_flash_len - 1,
                        &flash_info[0]);
 
        flash_protect ( FLAG_PROTECT_SET,
-                       CFG_ENV_ADDR,
-                       CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]);
+                       CONFIG_ENV_ADDR,
+                       CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);
 
-#ifdef CFG_ENV_ADDR_REDUND
+#ifdef CONFIG_ENV_ADDR_REDUND
        flash_protect ( FLAG_PROTECT_SET,
-                       CFG_ENV_ADDR_REDUND,
-                       CFG_ENV_ADDR_REDUND + CFG_ENV_SIZE_REDUND - 1,
+                       CONFIG_ENV_ADDR_REDUND,
+                       CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SIZE_REDUND - 1,
                        &flash_info[0]);
 #endif
 
@@ -149,7 +149,7 @@ void flash_print_info (flash_info_t * info)
        }
        printf ("\n");
 
-  Done:
+Done:  ;
 }
 
 /*-----------------------------------------------------------------------
@@ -353,8 +353,7 @@ outahere:
  * Copy memory to flash
  */
 
-volatile static int write_word (flash_info_t * info, ulong dest,
-                                                               ulong data)
+static int write_word (flash_info_t * info, ulong dest, ulong data)
 {
        vu_long *addr = (vu_long *) dest;
        ulong result;