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

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

diff --git a/include/configs/TOP5200.h b/include/configs/TOP5200.h
index 7240ce1..3818368 100644 (file)
--- a/include/configs/TOP5200.h
+++ b/include/configs/TOP5200.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
  */
@@ -67,6 +69,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
@@ -148,7 +151,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
@@ -175,7 +178,7 @@
 /*
  * IPB Bus clocking configuration.
  */
-#undef CFG_IPBCLK_EQUALS_XLBCLK                /* define for 133MHz speed */
+#undef CFG_IPBCLK_EQUALS_XLBCLK                /* define for 133MHz speed */
 
 /*
  * I2C configuration
@@ -230,7 +233,7 @@
 #define CFG_FLASH_BASE         0xff000000
 #define CFG_FLASH_SIZE         0x01000000
 #define CFG_MAX_FLASH_BANKS    1       /* max num of memory banks      */
-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0)
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0)
 
 #define CFG_MAX_FLASH_SECT     256     /* max num of sects on one chip */
 
@@ -268,9 +271,9 @@
 /*
  * Environment settings
  */
-#define CFG_ENV_IS_IN_EEPROM   1       /* turn on EEPROM env feature */
-#define CFG_ENV_OFFSET         0x1000
-#define CFG_ENV_SIZE           0x0700
+#define CONFIG_ENV_IS_IN_EEPROM        1       /* turn on EEPROM env feature */
+#define CONFIG_ENV_OFFSET              0x1000
+#define CONFIG_ENV_SIZE                0x0700
 
 /*
  * VPD settings