rename CFG_ENV macros to CONFIG_ENV

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
diff --git a/include/configs/IceCube.h b/include/configs/IceCube.h
index 804fc3f..a705ac1 100644
--- a/include/configs/IceCube.h
+++ b/include/configs/IceCube.h
@@ -213,26 +213,26 @@
 #define CFG_FLASH_BASE		0xFE000000
 #define CFG_FLASH_SIZE		0x01000000
 #if !defined(CFG_LOWBOOT)
-#define CFG_ENV_ADDR		(CFG_FLASH_BASE + 0x01760000 + 0x00800000)
+#define CONFIG_ENV_ADDR		(CFG_FLASH_BASE + 0x01760000 + 0x00800000)
 #else	/* CFG_LOWBOOT */
 #if defined(CFG_LOWBOOT08)
 # error CFG_LOWBOOT08 is incompatible with the Lite5200B
 #endif
 #if defined(CFG_LOWBOOT16)
-#define CFG_ENV_ADDR		(CFG_FLASH_BASE + 0x01060000)
+#define CONFIG_ENV_ADDR		(CFG_FLASH_BASE + 0x01060000)
 #endif
 #endif /* CFG_LOWBOOT */
 #else /* !CONFIG_LITE5200B (IceCube)*/
 #define CFG_FLASH_BASE		0xFF000000
 #define CFG_FLASH_SIZE		0x01000000
 #if !defined(CFG_LOWBOOT)
-#define CFG_ENV_ADDR		(CFG_FLASH_BASE + 0x00740000 + 0x00800000)
+#define CONFIG_ENV_ADDR		(CFG_FLASH_BASE + 0x00740000 + 0x00800000)
 #else	/* CFG_LOWBOOT */
 #if defined(CFG_LOWBOOT08)
-#define CFG_ENV_ADDR		(CFG_FLASH_BASE + 0x00040000 + 0x00800000)
+#define CONFIG_ENV_ADDR		(CFG_FLASH_BASE + 0x00040000 + 0x00800000)
 #endif
 #if defined(CFG_LOWBOOT16)
-#define CFG_ENV_ADDR		(CFG_FLASH_BASE + 0x00040000)
+#define CONFIG_ENV_ADDR		(CFG_FLASH_BASE + 0x00040000)
 #endif
 #endif	/* CFG_LOWBOOT */
 #endif /* CONFIG_LITE5200B */
@@ -256,11 +256,11 @@
  * Environment settings
  */
 #define CONFIG_ENV_IS_IN_FLASH	1
-#define CFG_ENV_SIZE		0x10000
+#define CONFIG_ENV_SIZE		0x10000
 #if defined(CONFIG_LITE5200B)
-#define CFG_ENV_SECT_SIZE	0x20000
+#define CONFIG_ENV_SECT_SIZE	0x20000
 #else
-#define CFG_ENV_SECT_SIZE	0x10000
+#define CONFIG_ENV_SECT_SIZE	0x10000
 #endif
 #define CONFIG_ENV_OVERWRITE	1