Merge branch 'master' of /home/wd/git/u-boot/custodians

[platform/kernel/u-boot.git] / include / configs / MPC8572DS.h

diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h
index b0094f3..d7e3a88 100644 (file)
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -426,14 +426,14 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
 /*
  * Environment
  */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #if CFG_MONITOR_BASE > 0xfff80000
-#define CFG_ENV_ADDR           0xfff80000
+#define CONFIG_ENV_ADDR                0xfff80000
 #else
-#define CFG_ENV_ADDR           (CFG_MONITOR_BASE + 0x70000)
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE + 0x70000)
 #endif
-#define CFG_ENV_SIZE           0x2000
-#define CFG_ENV_SECT_SIZE      0x20000 /* 128K (one sector) */
+#define CONFIG_ENV_SIZE                0x2000
+#define CONFIG_ENV_SECT_SIZE   0x20000 /* 128K (one sector) */
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */
 #define CFG_LOADS_BAUD_CHANGE  1       /* allow baudrate change */