rename CFG_ENV macros to CONFIG_ENV

[people/ms/u-boot.git] / board / gen860t / flash.c

diff --git a/board/gen860t/flash.c b/board/gen860t/flash.c
index c558014e7d3d6ba572e0203991c6e527ca4eef1f..a46e7e60803759e678b39429c49afb6cda872ed0 100644 (file)
--- a/board/gen860t/flash.c
+++ b/board/gen860t/flash.c
@@ -26,14 +26,14 @@
 #include <mpc8xx.h>
 
 #if defined(CONFIG_ENV_IS_IN_FLASH)
-# ifndef  CFG_ENV_ADDR
-#  define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
+# ifndef  CONFIG_ENV_ADDR
+#  define CONFIG_ENV_ADDR      (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)
 # endif
-# ifndef  CFG_ENV_SIZE
-#  define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
+# ifndef  CONFIG_ENV_SIZE
+#  define CONFIG_ENV_SIZE      CONFIG_ENV_SECT_SIZE
 # endif
-# ifndef  CFG_ENV_SECT_SIZE
-#  define CFG_ENV_SECT_SIZE  CFG_ENV_SIZE
+# ifndef  CONFIG_ENV_SECT_SIZE
+#  define CONFIG_ENV_SECT_SIZE  CONFIG_ENV_SIZE
 # endif
 #endif
 
@@ -166,8 +166,8 @@ flash_init (void)
         * Environment protection ON by default
         */
        flash_protect(FLAG_PROTECT_SET,
-                         CFG_ENV_ADDR,
-                         CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,
+                         CONFIG_ENV_ADDR,
+                         CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,
                          &flash_info[0]);
 #endif