Merge branch 'master' of /home/wd/git/u-boot/custodians

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

diff --git a/board/lart/flash.c b/board/lart/flash.c
index 013c2fd..4326d07 100644 (file)
--- a/board/lart/flash.c
+++ b/board/lart/flash.c
@@ -109,8 +109,8 @@ ulong flash_init(void)
                  &flash_info[0]);
 
     flash_protect(FLAG_PROTECT_SET,
-                 CFG_ENV_ADDR,
-                 CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
+                 CONFIG_ENV_ADDR,
+                 CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,
                  &flash_info[0]);
 
     return size;
@@ -159,6 +159,7 @@ void flash_print_info  (flash_info_t *info)
     printf ("\n");
 
 Done:
+    ;
 }
 
 /*-----------------------------------------------------------------------
@@ -347,7 +348,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;