Merge branch 'next'

[u-boot] / include / configs / BC3450.h

diff --git a/include/configs/BC3450.h b/include/configs/BC3450.h
index 3d09ee7f32c9c89fdab49e9a0e4a23dcdac09afd..3c5d03812eb2bf6c9a2c98e3aebca20c5b866945 100644 (file)
--- a/include/configs/BC3450.h
+++ b/include/configs/BC3450.h
@@ -61,6 +61,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
  */
@@ -87,6 +89,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
@@ -325,7 +328,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 */