rename CFG_ENV macros to CONFIG_ENV

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
diff --git a/include/configs/G2000.h b/include/configs/G2000.h
index 43926a2..81a12f15 100644
--- a/include/configs/G2000.h
+++ b/include/configs/G2000.h
@@ -300,15 +300,15 @@
  */
 #if 1 /* test-only */
 #define CONFIG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
-#define CFG_ENV_OFFSET		0x100	/* environment starts at the beginning of the EEPROM */
-#define CFG_ENV_SIZE		0x700	/* 2048 bytes may be used for env vars*/
+#define CONFIG_ENV_OFFSET		0x100	/* environment starts at the beginning of the EEPROM */
+#define CONFIG_ENV_SIZE		0x700	/* 2048 bytes may be used for env vars*/
 				   /* total size of a CAT24WC16 is 2048 bytes */
 
 #else	/* DEFAULT: environment in flash, using redundand flash sectors */
 
 #define CONFIG_ENV_IS_IN_FLASH	1	/* use FLASH for environment vars */
-#define CFG_ENV_ADDR		0xFFFA0000 /* environment starts before u-boot */
-#define CFG_ENV_SECT_SIZE	0x20000	/* 128k bytes may be used for env vars*/
+#define CONFIG_ENV_ADDR		0xFFFA0000 /* environment starts before u-boot */
+#define CONFIG_ENV_SECT_SIZE	0x20000	/* 128k bytes may be used for env vars*/
 
 #endif