From: Kumar Gala <galak@kernel.crashing.org>
Date: Thu, 17 Sep 2009 05:01:14 +0000 (-0500)
Subject: ppc/8xxx: Don't use pci_cfg on FSL_CORENET platforms
X-Git-Tag: v2010.03-rc1~191
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=178e39e199e9c985e5e5e968d60d7243fceb5616;p=oweals%2Fu-boot.git

ppc/8xxx: Don't use pci_cfg on FSL_CORENET platforms

The FSL_CORENET platforms use a completely different means to determine
which PCIe port is enabled as well as if its a host or agent/end-point.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---

diff --git a/cpu/mpc8xxx/pci_cfg.c b/cpu/mpc8xxx/pci_cfg.c
index 9c7d92c4d9..ea129c52a0 100644
--- a/cpu/mpc8xxx/pci_cfg.c
+++ b/cpu/mpc8xxx/pci_cfg.c
@@ -210,10 +210,12 @@ static struct pci_info pci_config_info[] =
 		.cfg =   (1 << 2) | (1 << 4),
 	},
 };
+#elif defined(CONFIG_FSL_CORENET)
 #else
 #error Need to define pci_config_info for processor
 #endif
 
+#ifndef CONFIG_FSL_CORENET
 int is_fsl_pci_agent(enum law_trgt_if trgt, u32 host_agent)
 {
 	return ((1 << host_agent) & pci_config_info[trgt].agent);
@@ -223,3 +225,4 @@ int is_fsl_pci_cfg(enum law_trgt_if trgt, u32 io_sel)
 {
 	return ((1 << io_sel) & pci_config_info[trgt].cfg);
 }
+#endif