rename CFG_ENV macros to CONFIG_ENV

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

diff --git a/include/configs/cpci5200.h b/include/configs/cpci5200.h
index ce4ea1f..1f53ddc 100644 (file)
--- a/include/configs/cpci5200.h
+++ b/include/configs/cpci5200.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
  */
@@ -69,6 +71,7 @@
 #define CONFIG_PCI_PNP         1
 #endif
 #define CONFIG_PCI_SCAN_SHOW   1
+#define CONFIG_PCIAUTO_SKIP_HOST_BRIDGE        1
 
 #define CONFIG_PCI_MEM_BUS     0x40000000
 #define CONFIG_PCI_MEM_PHYS    CONFIG_PCI_MEM_BUS
@@ -202,7 +205,7 @@
 #define CFG_FLASH_BASE         0xFE000000
 #define CFG_FLASH_SIZE         0x02000000
 #define CFG_FLASH_INCREMENT    0x01000000
-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x00000000)
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x00000000)
 #define CFG_MAX_FLASH_BANKS    2       /* max num of memory banks      */
 #define CFG_MAX_FLASH_SECT     128
 
@@ -216,14 +219,14 @@
  * Environment settings
  */
 #if 1                          /* test-only */
-#define CFG_ENV_IS_IN_FLASH    1
-#define CFG_ENV_SIZE           0x20000
-#define CFG_ENV_SECT_SIZE      0x20000
+#define CONFIG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_SIZE                0x20000
+#define CONFIG_ENV_SECT_SIZE   0x20000
 #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