diff --git a/drivers/pci/pci_auto.c b/drivers/pci/pci_auto.c
index acfda83ba50b325f0f2076c8e9544796f8629d91..eb6959376a7e16569ce07f795dc3ac3e773241fb 100644
--- a/drivers/pci/pci_auto.c
+++ b/drivers/pci/pci_auto.c
@@ -383,7 +383,7 @@ int pciauto_config_device(struct pci_controller *hose, pci_dev_t dev)
 		hose->current_busno++;
 		break;
 
-#ifdef CONFIG_MPC5200
+#if defined(CONFIG_PCIAUTO_SKIP_HOST_BRIDGE)
 	case PCI_CLASS_BRIDGE_OTHER:
 		DEBUGF("PCI Autoconfig: Skipping bridge device %d\n",
 		       PCI_DEV(dev));
diff --git a/include/configs/BC3450.h b/include/configs/BC3450.h
index 3d09ee7f32c9c89fdab49e9a0e4a23dcdac09afd..706c13efad4047ed18afae786adc11ced0ff298f 100644
--- a/include/configs/BC3450.h
+++ b/include/configs/BC3450.h
@@ -87,6 +87,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
diff --git a/include/configs/IceCube.h b/include/configs/IceCube.h
index 9b485a91a018e74be545d3c08fc9c1789346b54d..38a022611ae92a31c9b680f3519945bc8e9bcef6 100644
--- a/include/configs/IceCube.h
+++ b/include/configs/IceCube.h
@@ -56,6 +56,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
diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h
index f33ccb0c80481a926713b966eb6b50a2342e8db1..a3c71e37dc583fa74d63b178c2357aba4827ed8d 100644
--- a/include/configs/M54455EVB.h
+++ b/include/configs/M54455EVB.h
@@ -179,7 +179,7 @@
 #ifdef CONFIG_CMD_PCI
 #define CONFIG_PCI		1
 #define CONFIG_PCI_PNP		1
-#define CONFIG_SKIPPCI_HOSTBRIDGE
+#define CONFIG_PCIAUTO_SKIP_HOST_BRIDGE	1
 
 #define CFG_PCI_CACHE_LINE_SIZE	4
 
diff --git a/include/configs/M5475EVB.h b/include/configs/M5475EVB.h
index f0d42beb9979d38f9b5a89843286abc0601a295b..a4e6c5d12573a573a98b926fa2010920480ccbca 100644
--- a/include/configs/M5475EVB.h
+++ b/include/configs/M5475EVB.h
@@ -132,7 +132,7 @@
 #ifdef CONFIG_CMD_PCI
 #define CONFIG_PCI		1
 #define CONFIG_PCI_PNP		1
-#define CONFIG_SKIPPCI_HOSTBRIDGE
+#define CONFIG_PCIAUTO_SKIP_HOST_BRIDGE	1
 
 #define CFG_PCI_CACHE_LINE_SIZE	8
 
diff --git a/include/configs/M5485EVB.h b/include/configs/M5485EVB.h
index 88dd21976c339cee0c64c15da6041021b1904363..9121023f8984b4ee2799d330752996ef19850f92 100644
--- a/include/configs/M5485EVB.h
+++ b/include/configs/M5485EVB.h
@@ -129,6 +129,7 @@
 #ifdef CONFIG_CMD_PCI
 #define CONFIG_PCI		1
 #define CONFIG_PCI_PNP		1
+#define CONFIG_PCIAUTO_SKIP_HOST_BRIDGE	1
 
 #define CFG_PCI_MEM_BUS		0x80000000
 #define CFG_PCI_MEM_PHYS	CFG_PCI_MEM_BUS
diff --git a/include/configs/PM520.h b/include/configs/PM520.h
index d9405b012ea5ac61ee73c23bcfc3fa9cc921e903..ad480a6c9eede968531be15424fd63df0600f112 100644
--- a/include/configs/PM520.h
+++ b/include/configs/PM520.h
@@ -57,6 +57,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
diff --git a/include/configs/TOP5200.h b/include/configs/TOP5200.h
index dea5ead63d7a1243685dfc8d5f3b50d86790bfba..1affcfdebb56b0fc7df9532c84b0f5556b164052 100644
--- a/include/configs/TOP5200.h
+++ b/include/configs/TOP5200.h
@@ -67,6 +67,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
diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index b36c8264da9fe3b6b9d083a416e74916d91f7ad1..bff2edf76963194ae1a0cfa54310a474cc64b2d9 100644
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -190,6 +190,7 @@
 
 #ifdef CONFIG_PCI
 #define CONFIG_CMD_PCI
+#define CONFIG_PCIAUTO_SKIP_HOST_BRIDGE	1
 #endif
 
 #if defined(CONFIG_MINIFAP) || defined(CONFIG_STK52XX) || defined(CONFIG_FO300)
diff --git a/include/configs/Total5200.h b/include/configs/Total5200.h
index 2e9a2bcc74846a0517bc91a5389b5a86af6be545..2507d77776547beb31194a4085a95f08f4289604 100644
--- a/include/configs/Total5200.h
+++ b/include/configs/Total5200.h
@@ -80,6 +80,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
diff --git a/include/configs/aev.h b/include/configs/aev.h
index 0163025f7f65b99002687a89c1a2506e6cc874ae..e3f810c5c89508f38a054d5ef7738725f1887d29 100644
--- a/include/configs/aev.h
+++ b/include/configs/aev.h
@@ -60,6 +60,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
diff --git a/include/configs/cpci5200.h b/include/configs/cpci5200.h
index ce4ea1f8dbe9fb0469258223aa58d5b310b19dc0..1b30e51a3feac90f81aa29cacd291ed896e86a5c 100644
--- a/include/configs/cpci5200.h
+++ b/include/configs/cpci5200.h
@@ -69,6 +69,7 @@
 #define CONFIG_PCI_PNP		1
 #endif
 #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
diff --git a/include/configs/hmi1001.h b/include/configs/hmi1001.h
index 434762514f2ab80e4f7976cc2f49017d80b4dd39..e5a88977445bd768d3f42d6f8c4d25642d59725b 100644
--- a/include/configs/hmi1001.h
+++ b/include/configs/hmi1001.h
@@ -336,6 +336,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
diff --git a/include/configs/inka4x0.h b/include/configs/inka4x0.h
index 6f45c043c3b2ed2ae4e8a5964b413c1fdaaa0e4d..c89f041ee470bf0107cdb341c0d36f4d90b4beb5 100644
--- a/include/configs/inka4x0.h
+++ b/include/configs/inka4x0.h
@@ -55,6 +55,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
diff --git a/include/configs/jupiter.h b/include/configs/jupiter.h
index 8c6075fe5ef0859f52d58240ddcb3a0a8dc969c8..0ac3e7e7b9d4b433073fab949b59544fce7543a6 100644
--- a/include/configs/jupiter.h
+++ b/include/configs/jupiter.h
@@ -58,6 +58,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
diff --git a/include/configs/o2dnt.h b/include/configs/o2dnt.h
index f75e194910c73763fceda67a4f45735edc172bdd..8dde1ef3916e7cba3d7e5c1207e8449b1c192532 100644
--- a/include/configs/o2dnt.h
+++ b/include/configs/o2dnt.h
@@ -52,6 +52,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
diff --git a/include/configs/pf5200.h b/include/configs/pf5200.h
index 18d0c879a9ed474ca2580074b78721df76f825cb..2ce39c913c831a2e873ca04ddef34a4b07b727ed 100644
--- a/include/configs/pf5200.h
+++ b/include/configs/pf5200.h
@@ -69,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
diff --git a/include/configs/spieval.h b/include/configs/spieval.h
index a9ce015962bd025b36c072583f7ee75ecba41c91..49213dc67ade3c71ee6c46724b87706fdc89d7dc 100644
--- a/include/configs/spieval.h
+++ b/include/configs/spieval.h
@@ -164,6 +164,7 @@
 
 #ifdef CONFIG_PCI
     #define CONFIG_CMD_PCI
+    #define CONFIG_PCIAUTO_SKIP_HOST_BRIDGE	1
 #endif
 
 #ifdef CONFIG_POST