rename CFG_ENV macros to CONFIG_ENV

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
diff --git a/include/configs/apollon.h b/include/configs/apollon.h
index 6e34ddf..edfae27 100644
--- a/include/configs/apollon.h
+++ b/include/configs/apollon.h
@@ -72,8 +72,8 @@
 /*
  * Size of malloc() pool
  */
-#define	CFG_ENV_SIZE SZ_128K	/* Total Size of Environment Sector */
-#define	CFG_MALLOC_LEN	(CFG_ENV_SIZE + SZ_128K)
+#define	CONFIG_ENV_SIZE SZ_128K	/* Total Size of Environment Sector */
+#define	CFG_MALLOC_LEN	(CONFIG_ENV_SIZE + SZ_128K)
 #define	CFG_GBL_DATA_SIZE	128	/* bytes reserved for initial data */
 
 /*
@@ -226,6 +226,6 @@
 /* OneNAND boot, OneNAND has CS0, NOR boot ONeNAND has CS2 */
 #define	CFG_ONENAND_BASE	0x00000000
 #define	CONFIG_ENV_IS_IN_ONENAND	1
-#define CFG_ENV_ADDR		0x00020000
+#define CONFIG_ENV_ADDR		0x00020000
 
 #endif /* __CONFIG_H */