rename CFG_ENV macros to CONFIG_ENV

[karo-tx-uboot.git] / board / sbc2410x / flash.c

diff --git a/board/sbc2410x/flash.c b/board/sbc2410x/flash.c
index f2718f256ff6ca91165231e8318373f72e29f6b0..fa3996ddcf55bbd7a40d1e75626829f8b2c042d4 100644 (file)
--- a/board/sbc2410x/flash.c
+++ b/board/sbc2410x/flash.c
@@ -114,8 +114,8 @@ ulong flash_init (void)
                       &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]);
 
        return size;
 }
@@ -288,7 +288,7 @@ int flash_erase (flash_info_t * info, int s_first, int s_last)
  * Copy memory to flash
  */
 
-volatile static int write_hword (flash_info_t * info, ulong dest, ushort data)
+static int write_hword (flash_info_t * info, ulong dest, ushort data)
 {
        vu_short *addr = (vu_short *) dest;
        ushort result;