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 <Tsi-Chung.Liew@freescale.com>
This commit is contained in:

committed by
Wolfgang Denk

parent
e99ccb4881
commit
f33fca22e7
@@ -383,7 +383,7 @@ int pciauto_config_device(struct pci_controller *hose, pci_dev_t dev)
|
|||||||
hose->current_busno++;
|
hose->current_busno++;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
#ifdef CONFIG_MPC5200
|
#if defined(CONFIG_PCIAUTO_SKIP_HOST_BRIDGE)
|
||||||
case PCI_CLASS_BRIDGE_OTHER:
|
case PCI_CLASS_BRIDGE_OTHER:
|
||||||
DEBUGF("PCI Autoconfig: Skipping bridge device %d\n",
|
DEBUGF("PCI Autoconfig: Skipping bridge device %d\n",
|
||||||
PCI_DEV(dev));
|
PCI_DEV(dev));
|
||||||
|
@@ -87,6 +87,7 @@
|
|||||||
# define CONFIG_PCI 1
|
# define CONFIG_PCI 1
|
||||||
# define CONFIG_PCI_PNP 1
|
# define CONFIG_PCI_PNP 1
|
||||||
/* #define CONFIG_PCI_SCAN_SHOW 1 */
|
/* #define CONFIG_PCI_SCAN_SHOW 1 */
|
||||||
|
#define CONFIG_PCIAUTO_SKIP_HOST_BRIDGE 1
|
||||||
|
|
||||||
#define CONFIG_PCI_MEM_BUS 0x40000000
|
#define CONFIG_PCI_MEM_BUS 0x40000000
|
||||||
#define CONFIG_PCI_MEM_PHYS CONFIG_PCI_MEM_BUS
|
#define CONFIG_PCI_MEM_PHYS CONFIG_PCI_MEM_BUS
|
||||||
|
@@ -56,6 +56,7 @@
|
|||||||
#if defined(CONFIG_PCI)
|
#if defined(CONFIG_PCI)
|
||||||
#define CONFIG_PCI_PNP 1
|
#define CONFIG_PCI_PNP 1
|
||||||
#define CONFIG_PCI_SCAN_SHOW 1
|
#define CONFIG_PCI_SCAN_SHOW 1
|
||||||
|
#define CONFIG_PCIAUTO_SKIP_HOST_BRIDGE 1
|
||||||
|
|
||||||
#define CONFIG_PCI_MEM_BUS 0x40000000
|
#define CONFIG_PCI_MEM_BUS 0x40000000
|
||||||
#define CONFIG_PCI_MEM_PHYS CONFIG_PCI_MEM_BUS
|
#define CONFIG_PCI_MEM_PHYS CONFIG_PCI_MEM_BUS
|
||||||
|
@@ -179,7 +179,7 @@
|
|||||||
#ifdef CONFIG_CMD_PCI
|
#ifdef CONFIG_CMD_PCI
|
||||||
#define CONFIG_PCI 1
|
#define CONFIG_PCI 1
|
||||||
#define CONFIG_PCI_PNP 1
|
#define CONFIG_PCI_PNP 1
|
||||||
#define CONFIG_SKIPPCI_HOSTBRIDGE
|
#define CONFIG_PCIAUTO_SKIP_HOST_BRIDGE 1
|
||||||
|
|
||||||
#define CFG_PCI_CACHE_LINE_SIZE 4
|
#define CFG_PCI_CACHE_LINE_SIZE 4
|
||||||
|
|
||||||
|
@@ -132,7 +132,7 @@
|
|||||||
#ifdef CONFIG_CMD_PCI
|
#ifdef CONFIG_CMD_PCI
|
||||||
#define CONFIG_PCI 1
|
#define CONFIG_PCI 1
|
||||||
#define CONFIG_PCI_PNP 1
|
#define CONFIG_PCI_PNP 1
|
||||||
#define CONFIG_SKIPPCI_HOSTBRIDGE
|
#define CONFIG_PCIAUTO_SKIP_HOST_BRIDGE 1
|
||||||
|
|
||||||
#define CFG_PCI_CACHE_LINE_SIZE 8
|
#define CFG_PCI_CACHE_LINE_SIZE 8
|
||||||
|
|
||||||
|
@@ -129,6 +129,7 @@
|
|||||||
#ifdef CONFIG_CMD_PCI
|
#ifdef CONFIG_CMD_PCI
|
||||||
#define CONFIG_PCI 1
|
#define CONFIG_PCI 1
|
||||||
#define CONFIG_PCI_PNP 1
|
#define CONFIG_PCI_PNP 1
|
||||||
|
#define CONFIG_PCIAUTO_SKIP_HOST_BRIDGE 1
|
||||||
|
|
||||||
#define CFG_PCI_MEM_BUS 0x80000000
|
#define CFG_PCI_MEM_BUS 0x80000000
|
||||||
#define CFG_PCI_MEM_PHYS CFG_PCI_MEM_BUS
|
#define CFG_PCI_MEM_PHYS CFG_PCI_MEM_BUS
|
||||||
|
@@ -57,6 +57,7 @@
|
|||||||
#define CONFIG_PCI 1
|
#define CONFIG_PCI 1
|
||||||
#define CONFIG_PCI_PNP 1
|
#define CONFIG_PCI_PNP 1
|
||||||
#define CONFIG_PCI_SCAN_SHOW 1
|
#define CONFIG_PCI_SCAN_SHOW 1
|
||||||
|
#define CONFIG_PCIAUTO_SKIP_HOST_BRIDGE 1
|
||||||
|
|
||||||
#define CONFIG_PCI_MEM_BUS 0x40000000
|
#define CONFIG_PCI_MEM_BUS 0x40000000
|
||||||
#define CONFIG_PCI_MEM_PHYS CONFIG_PCI_MEM_BUS
|
#define CONFIG_PCI_MEM_PHYS CONFIG_PCI_MEM_BUS
|
||||||
|
@@ -67,6 +67,7 @@
|
|||||||
# define CONFIG_PCI 1
|
# define CONFIG_PCI 1
|
||||||
# define CONFIG_PCI_PNP 1
|
# define CONFIG_PCI_PNP 1
|
||||||
# define CONFIG_PCI_SCAN_SHOW 1
|
# define CONFIG_PCI_SCAN_SHOW 1
|
||||||
|
# define CONFIG_PCIAUTO_SKIP_HOST_BRIDGE 1
|
||||||
|
|
||||||
# define CONFIG_PCI_MEM_BUS 0x40000000
|
# define CONFIG_PCI_MEM_BUS 0x40000000
|
||||||
# define CONFIG_PCI_MEM_PHYS CONFIG_PCI_MEM_BUS
|
# define CONFIG_PCI_MEM_PHYS CONFIG_PCI_MEM_BUS
|
||||||
|
@@ -190,6 +190,7 @@
|
|||||||
|
|
||||||
#ifdef CONFIG_PCI
|
#ifdef CONFIG_PCI
|
||||||
#define CONFIG_CMD_PCI
|
#define CONFIG_CMD_PCI
|
||||||
|
#define CONFIG_PCIAUTO_SKIP_HOST_BRIDGE 1
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(CONFIG_MINIFAP) || defined(CONFIG_STK52XX) || defined(CONFIG_FO300)
|
#if defined(CONFIG_MINIFAP) || defined(CONFIG_STK52XX) || defined(CONFIG_FO300)
|
||||||
|
@@ -80,6 +80,7 @@
|
|||||||
#define CONFIG_PCI 1
|
#define CONFIG_PCI 1
|
||||||
#define CONFIG_PCI_PNP 1
|
#define CONFIG_PCI_PNP 1
|
||||||
#define CONFIG_PCI_SCAN_SHOW 1
|
#define CONFIG_PCI_SCAN_SHOW 1
|
||||||
|
#define CONFIG_PCIAUTO_SKIP_HOST_BRIDGE 1
|
||||||
|
|
||||||
#define CONFIG_PCI_MEM_BUS 0x40000000
|
#define CONFIG_PCI_MEM_BUS 0x40000000
|
||||||
#define CONFIG_PCI_MEM_PHYS CONFIG_PCI_MEM_BUS
|
#define CONFIG_PCI_MEM_PHYS CONFIG_PCI_MEM_BUS
|
||||||
|
@@ -60,6 +60,7 @@
|
|||||||
#define CONFIG_PCI 1
|
#define CONFIG_PCI 1
|
||||||
#define CONFIG_PCI_PNP 1
|
#define CONFIG_PCI_PNP 1
|
||||||
/* #define CONFIG_PCI_SCAN_SHOW 1 */
|
/* #define CONFIG_PCI_SCAN_SHOW 1 */
|
||||||
|
#define CONFIG_PCIAUTO_SKIP_HOST_BRIDGE 1
|
||||||
|
|
||||||
#define CONFIG_PCI_MEM_BUS 0x40000000
|
#define CONFIG_PCI_MEM_BUS 0x40000000
|
||||||
#define CONFIG_PCI_MEM_PHYS CONFIG_PCI_MEM_BUS
|
#define CONFIG_PCI_MEM_PHYS CONFIG_PCI_MEM_BUS
|
||||||
|
@@ -69,6 +69,7 @@
|
|||||||
#define CONFIG_PCI_PNP 1
|
#define CONFIG_PCI_PNP 1
|
||||||
#endif
|
#endif
|
||||||
#define CONFIG_PCI_SCAN_SHOW 1
|
#define CONFIG_PCI_SCAN_SHOW 1
|
||||||
|
#define CONFIG_PCIAUTO_SKIP_HOST_BRIDGE 1
|
||||||
|
|
||||||
#define CONFIG_PCI_MEM_BUS 0x40000000
|
#define CONFIG_PCI_MEM_BUS 0x40000000
|
||||||
#define CONFIG_PCI_MEM_PHYS CONFIG_PCI_MEM_BUS
|
#define CONFIG_PCI_MEM_PHYS CONFIG_PCI_MEM_BUS
|
||||||
|
@@ -336,6 +336,7 @@
|
|||||||
#define CONFIG_PCI 1
|
#define CONFIG_PCI 1
|
||||||
#define CONFIG_PCI_PNP 1
|
#define CONFIG_PCI_PNP 1
|
||||||
#define CONFIG_PCI_SCAN_SHOW 1
|
#define CONFIG_PCI_SCAN_SHOW 1
|
||||||
|
#define CONFIG_PCIAUTO_SKIP_HOST_BRIDGE 1
|
||||||
|
|
||||||
#define CONFIG_PCI_MEM_BUS 0x40000000
|
#define CONFIG_PCI_MEM_BUS 0x40000000
|
||||||
#define CONFIG_PCI_MEM_PHYS CONFIG_PCI_MEM_BUS
|
#define CONFIG_PCI_MEM_PHYS CONFIG_PCI_MEM_BUS
|
||||||
|
@@ -55,6 +55,7 @@
|
|||||||
#define CONFIG_PCI 1
|
#define CONFIG_PCI 1
|
||||||
#define CONFIG_PCI_PNP 1
|
#define CONFIG_PCI_PNP 1
|
||||||
#define CONFIG_PCI_SCAN_SHOW 1
|
#define CONFIG_PCI_SCAN_SHOW 1
|
||||||
|
#define CONFIG_PCIAUTO_SKIP_HOST_BRIDGE 1
|
||||||
|
|
||||||
#define CONFIG_PCI_MEM_BUS 0x40000000
|
#define CONFIG_PCI_MEM_BUS 0x40000000
|
||||||
#define CONFIG_PCI_MEM_PHYS CONFIG_PCI_MEM_BUS
|
#define CONFIG_PCI_MEM_PHYS CONFIG_PCI_MEM_BUS
|
||||||
|
@@ -58,6 +58,7 @@
|
|||||||
#if defined(CONFIG_PCI)
|
#if defined(CONFIG_PCI)
|
||||||
#define CONFIG_PCI_PNP 1
|
#define CONFIG_PCI_PNP 1
|
||||||
#define CONFIG_PCI_SCAN_SHOW 1
|
#define CONFIG_PCI_SCAN_SHOW 1
|
||||||
|
#define CONFIG_PCIAUTO_SKIP_HOST_BRIDGE 1
|
||||||
|
|
||||||
#define CONFIG_PCI_MEM_BUS 0x40000000
|
#define CONFIG_PCI_MEM_BUS 0x40000000
|
||||||
#define CONFIG_PCI_MEM_PHYS CONFIG_PCI_MEM_BUS
|
#define CONFIG_PCI_MEM_PHYS CONFIG_PCI_MEM_BUS
|
||||||
|
@@ -52,6 +52,7 @@
|
|||||||
#define CONFIG_PCI 1
|
#define CONFIG_PCI 1
|
||||||
#define CONFIG_PCI_PNP 1
|
#define CONFIG_PCI_PNP 1
|
||||||
/* #define CONFIG_PCI_SCAN_SHOW 1 */
|
/* #define CONFIG_PCI_SCAN_SHOW 1 */
|
||||||
|
#define CONFIG_PCIAUTO_SKIP_HOST_BRIDGE 1
|
||||||
|
|
||||||
#define CONFIG_PCI_MEM_BUS 0x40000000
|
#define CONFIG_PCI_MEM_BUS 0x40000000
|
||||||
#define CONFIG_PCI_MEM_PHYS CONFIG_PCI_MEM_BUS
|
#define CONFIG_PCI_MEM_PHYS CONFIG_PCI_MEM_BUS
|
||||||
|
@@ -69,6 +69,7 @@
|
|||||||
#define CONFIG_PCI 1
|
#define CONFIG_PCI 1
|
||||||
#define CONFIG_PCI_PNP 1
|
#define CONFIG_PCI_PNP 1
|
||||||
#define CONFIG_PCI_SCAN_SHOW 1
|
#define CONFIG_PCI_SCAN_SHOW 1
|
||||||
|
#define CONFIG_PCIAUTO_SKIP_HOST_BRIDGE 1
|
||||||
|
|
||||||
#define CONFIG_PCI_MEM_BUS 0x40000000
|
#define CONFIG_PCI_MEM_BUS 0x40000000
|
||||||
#define CONFIG_PCI_MEM_PHYS CONFIG_PCI_MEM_BUS
|
#define CONFIG_PCI_MEM_PHYS CONFIG_PCI_MEM_BUS
|
||||||
|
@@ -164,6 +164,7 @@
|
|||||||
|
|
||||||
#ifdef CONFIG_PCI
|
#ifdef CONFIG_PCI
|
||||||
#define CONFIG_CMD_PCI
|
#define CONFIG_CMD_PCI
|
||||||
|
#define CONFIG_PCIAUTO_SKIP_HOST_BRIDGE 1
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_POST
|
#ifdef CONFIG_POST
|
||||||
|
Reference in New Issue
Block a user