rename CFG_ENV macros to CONFIG_ENV

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

diff --git a/include/configs/aev.h b/include/configs/aev.h
index 5bab793..2dcaa58 100644 (file)
--- a/include/configs/aev.h
+++ b/include/configs/aev.h
@@ -41,6 +41,8 @@
 #define CONFIG_AEVFIFO         1
 #define CFG_MPC5XXX_CLKIN      33000000 /* ... running at 33.000000MHz */
 
+#define CONFIG_HIGH_BATS       1       /* High BATs supported */
+
 #define BOOTFLAG_COLD          0x01    /* Normal Power-On: Boot from FLASH  */
 #define BOOTFLAG_WARM          0x02    /* Software reboot           */
 
@@ -60,6 +62,7 @@
 #define CONFIG_PCI             1
 #define CONFIG_PCI_PNP         1
 /* #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
@@ -135,7 +138,7 @@
 #define CONFIG_BOOTDELAY       5       /* autoboot after 5 seconds */
 
 #define CONFIG_PREBOOT "echo;" \
-       "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+       "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
        "echo"
 
 #undef CONFIG_BOOTARGS
@@ -222,7 +225,7 @@
 
 /* use CFI flash driver if no module variant is spezified */
 #define CFG_FLASH_CFI          1       /* Flash is CFI conformant */
-#define CFG_FLASH_CFI_DRIVER   1       /* Use the common driver */
+#define CONFIG_FLASH_CFI_DRIVER        1       /* Use the common driver */
 #define CFG_FLASH_BANKS_LIST   { CFG_BOOTCS_START }
 #define CFG_FLASH_EMPTY_INFO
 #define CFG_FLASH_SIZE         0x04000000 /* 64 MByte */
@@ -230,9 +233,9 @@
 #undef CFG_FLASH_USE_BUFFER_WRITE      /* not supported yet for AMD */
 
 #if !defined(CFG_LOWBOOT)
-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x00760000 + 0x00800000)
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x00760000 + 0x00800000)
 #else  /* CFG_LOWBOOT */
-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x00060000)
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x00060000)
 #endif /* CFG_LOWBOOT */
 #define CFG_MAX_FLASH_BANKS    1       /* max num of flash banks
                                           (= chip selects) */
@@ -243,11 +246,11 @@
 /*
  * Environment settings
  */
-#define CFG_ENV_IS_IN_FLASH    1
-#define CFG_ENV_SIZE           0x10000
-#define CFG_ENV_SECT_SIZE      0x20000
-#define CFG_ENV_ADDR_REDUND    (CFG_ENV_ADDR + CFG_ENV_SECT_SIZE)
-#define        CFG_ENV_SIZE_REDUND     (CFG_ENV_SIZE)
+#define CONFIG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_SIZE                0x10000
+#define CONFIG_ENV_SECT_SIZE   0x20000
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
+#define        CONFIG_ENV_SIZE_REDUND  (CONFIG_ENV_SIZE)
 
 /*
  * Memory map