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

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

diff --git a/include/configs/PM520.h b/include/configs/PM520.h
index 5e0bb05..2676d7d 100644 (file)
--- a/include/configs/PM520.h
+++ b/include/configs/PM520.h
@@ -212,7 +212,7 @@
 #define CFG_FLASH_SIZE         0x04000000
 #define CFG_BOOTROM_BASE       0xFFF00000
 #define CFG_BOOTROM_SIZE       0x00080000
-#define CFG_ENV_ADDR           (0xFDF00000 + 0x40000)
+#define CONFIG_ENV_ADDR                (0xFDF00000 + 0x40000)
 #else
 /*
  * Flash configuration (8,16 or 32 MB)
@@ -225,7 +225,7 @@
  */
 #define CFG_FLASH_BASE         0xFC000000
 #define CFG_FLASH_SIZE         0x04000000
-#define CFG_ENV_ADDR           (0xFFF00000 + 0x40000)
+#define CONFIG_ENV_ADDR                (0xFFF00000 + 0x40000)
 #endif
 #define CFG_MAX_FLASH_BANKS    1       /* max num of memory banks      */
 
@@ -245,9 +245,9 @@
 /*
  * Environment settings
  */
-#define CFG_ENV_IS_IN_FLASH    1
-#define CFG_ENV_SIZE           0x10000
-#define CFG_ENV_SECT_SIZE      0x40000
+#define CONFIG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_SIZE                0x10000
+#define CONFIG_ENV_SECT_SIZE   0x40000
 #define CONFIG_ENV_OVERWRITE   1
 
 /*