Merge branch 'master' of git://www.denx.de/git/u-boot-mpc83xx

[oweals/u-boot.git] / include / configs / jupiter.h

diff --git a/include/configs/jupiter.h b/include/configs/jupiter.h
index 8c6075fe5ef0859f52d58240ddcb3a0a8dc969c8..c9859270c00ed0de5666f63a9e06dd88dc559b8e 100644 (file)
--- a/include/configs/jupiter.h
+++ b/include/configs/jupiter.h
@@ -41,6 +41,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
  */
@@ -58,6 +60,7 @@
 #if defined(CONFIG_PCI)
 #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
@@ -141,7 +144,7 @@
 /*
  * IPB Bus clocking configuration.
  */
-#undef CFG_IPBSPEED_133        /* define for 133MHz speed */
+#undef CFG_IPBSPEED_133                        /* define for 133MHz speed */
 
 #if 0
 /* pass open firmware flat tree */