-#define CFG_ENV_IS_IN_FLASH 1
-#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x8000000 - 0x40000)
-#define CFG_ENV_SIZE 0x4000 /* 16K */
-#define CFG_ENV_SECT_SIZE 0x20000
-#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR + 0x20000)
-#define CFG_ENV_SIZE_REDUND CFG_ENV_SIZE
+#define CONFIG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x8000000 - 0x40000)
+#define CONFIG_ENV_SIZE 0x4000 /* 16K */
+#define CONFIG_ENV_SECT_SIZE 0x20000
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + 0x20000)
+#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE