Signed-off-by: TsiChung Liew Tsi-Chung.Liew@freescale.com --- drivers/pci/pci_auto.c | 2 +- include/configs/BC3450.h | 1 + include/configs/M54455EVB.h | 2 +- include/configs/M5475EVB.h | 2 +- include/configs/M5485EVB.h | 1 + include/configs/PM520.h | 1 + include/configs/TOP5200.h | 1 + include/configs/TQM5200.h | 1 + include/configs/Total5200.h | 1 + include/configs/aev.h | 1 + include/configs/cpci5200.h | 1 + include/configs/hmi1001.h | 1 + include/configs/inka4x0.h | 1 + include/configs/jupiter.h | 1 + include/configs/o2dnt.h | 1 + include/configs/pf5200.h | 1 + include/configs/spieval.h | 1 + 17 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/drivers/pci/pci_auto.c b/drivers/pci/pci_auto.c index 1085a6c..a20b4e1 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;
-#if defined(CONFIG_MPC5200) || defined(CONFIG_PCIAUTO_SKIP_HOST_BRIDGE) +#ifdef 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 3d09ee7..706c13e 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/M54455EVB.h b/include/configs/M54455EVB.h index 5f55761..f5edddf 100644 --- a/include/configs/M54455EVB.h +++ b/include/configs/M54455EVB.h @@ -175,7 +175,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 f0d42be..a4e6c5d 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 88dd219..9121023 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 d9405b0..ad480a6 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 dea5ead..1affcfd 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 9a0e9b8..30d7baf 100644 --- a/include/configs/TQM5200.h +++ b/include/configs/TQM5200.h @@ -85,6 +85,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/Total5200.h b/include/configs/Total5200.h index 2e9a2bc..2507d77 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 0163025..2785db1 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 ce4ea1f..1b30e51 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 4347625..e5a8897 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 6f45c04..c89f041 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 8c6075f..0ac3e7e 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 f75e194..8dde1ef 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 18d0c87..2ce39c9 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 a9ce015..02c6b20 100644 --- a/include/configs/spieval.h +++ b/include/configs/spieval.h @@ -68,6 +68,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