rename CFG_ENV macros to CONFIG_ENV

[karo-tx-uboot.git] / include / configs / mecp5200.h

diff --git a/include/configs/mecp5200.h b/include/configs/mecp5200.h
index 5218d9ca97593b7a7a237315b616d284c6882ed0..8b13fc0acb4d122089beb0204bec28e42e002c4b 100644 (file)
--- a/include/configs/mecp5200.h
+++ b/include/configs/mecp5200.h
@@ -50,6 +50,8 @@
 #define BOOTFLAG_COLD          0x01    /* Normal Power-On: Boot from FLASH  */
 #define BOOTFLAG_WARM          0x02    /* Software reboot           */
 
+#define CONFIG_HIGH_BATS       1       /* High BATs supported */
+
 /*
  * Serial console configuration
  */
@@ -178,7 +180,7 @@
  */
 #define CFG_FLASH_BASE         0xFFC00000
 #define CFG_FLASH_SIZE         0x00400000
-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x003E0000)
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x003E0000)
 #define CFG_MAX_FLASH_BANKS    1       /* max num of memory banks      */
 #define CFG_MAX_FLASH_SECT     512
 
@@ -189,19 +191,19 @@
  * Environment settings
  */
 #if 1 /* test-only */
-#define CFG_ENV_IS_IN_FLASH    1
-#define CFG_ENV_SIZE           0x10000
-#define CFG_ENV_SECT_SIZE      0x10000
+#define CONFIG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_SIZE                0x10000
+#define CONFIG_ENV_SECT_SIZE   0x10000
 #define CONFIG_ENV_OVERWRITE   1
 #else
-#define CFG_ENV_IS_IN_EEPROM   1       /* use EEPROM for environment vars */
-#define CFG_ENV_OFFSET         0x0000  /* environment starts at the beginning of the EEPROM */
-#define CFG_ENV_SIZE           0x0400  /* 8192 bytes may be used for env vars*/
+#define CONFIG_ENV_IS_IN_EEPROM        1       /* use EEPROM for environment vars */
+#define CONFIG_ENV_OFFSET              0x0000  /* environment starts at the beginning of the EEPROM */
+#define CONFIG_ENV_SIZE                0x0400  /* 8192 bytes may be used for env vars*/
                                   /* total size of a CAT24WC32 is 8192 bytes */
 #define CONFIG_ENV_OVERWRITE   1
 #endif
 
-#define CFG_FLASH_CFI_DRIVER   1          /* Flash is CFI conformant           */
+#define CONFIG_FLASH_CFI_DRIVER        1          /* Flash is CFI conformant           */
 #define CFG_FLASH_CFI          1          /* Flash is CFI conformant           */
 #define CFG_FLASH_PROTECTION   1          /* use hardware protection           */
 #if 0