rename CFG_ENV macros to CONFIG_ENV

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

diff --git a/include/configs/o2dnt.h b/include/configs/o2dnt.h
index f1d73e4..b515388 100644 (file)
--- a/include/configs/o2dnt.h
+++ b/include/configs/o2dnt.h
@@ -37,6 +37,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
  */
@@ -52,6 +54,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
@@ -111,7 +114,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
@@ -187,7 +190,7 @@
  */
 #define CFG_FLASH_BASE         0xFF000000
 #define CFG_FLASH_SIZE         0x01000000
-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x00040000)
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x00040000)
 
 #define CFG_MAX_FLASH_BANKS    1       /* max num of memory banks      */
 #define CFG_MAX_FLASH_SECT     128     /* max num of sects on one chip */
@@ -200,9 +203,9 @@
 /*
  * Environment settings
  */
-#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
 
 /*