From f33fca22e76f20e4e4793810ca7a06a4805a6cf4 Mon Sep 17 00:00:00 2001 From: TsiChung Liew Date: Sun, 30 Mar 2008 01:19:06 -0500 Subject: [PATCH] Update CONFIG_PCIAUTO_SKIP_HOST_BRIDGE to related boards Remove test for CONFIG_MPC5200 in drivers/pci/pci_auto.c and define CONFIG_PCIAUTO_SKIP_HOST_BRIDGE in related board configuration files. Signed-off-by: TsiChung Liew --- drivers/pci/pci_auto.c | 2 +- include/configs/BC3450.h | 1 + include/configs/IceCube.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 + 18 files changed, 18 insertions(+), 3 deletions(-) diff --git a/drivers/pci/pci_auto.c b/drivers/pci/pci_auto.c index acfda83ba5..eb6959376a 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 3d09ee7f32..706c13efad 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 9b485a91a0..38a022611a 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 f33ccb0c80..a3c71e37dc 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 f0d42beb99..a4e6c5d125 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 88dd21976c..9121023f89 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 d9405b012e..ad480a6c9e 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 dea5ead63d..1affcfdebb 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 b36c8264da..bff2edf769 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 2e9a2bcc74..2507d77776 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 0163025f7f..e3f810c5c8 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 ce4ea1f8db..1b30e51a3f 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 434762514f..e5a8897744 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 6f45c043c3..c89f041ee4 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 8c6075fe5e..0ac3e7e7b9 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 f75e194910..8dde1ef391 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 18d0c879a9..2ce39c913c 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 a9ce015962..49213dc67a 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 -- 2.25.1