summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2009-10-29 16:54:52 +0100
committerStefan Roese <sr@denx.de>2009-11-09 11:27:08 +0100
commit9a81c61249d8361ed57d81f496121f3eb9c0eee8 (patch)
tree8fdae979d28249f795d065809321bad7ca138e52 /cpu
parentb0b867462c569e7accd6f78c942cbab028116ecf (diff)
downloadu-boot-imx-9a81c61249d8361ed57d81f496121f3eb9c0eee8.zip
u-boot-imx-9a81c61249d8361ed57d81f496121f3eb9c0eee8.tar.gz
u-boot-imx-9a81c61249d8361ed57d81f496121f3eb9c0eee8.tar.bz2
ppc4xx: Remove duplicated is_pci_host() functions
This patch introduces a weak default function for is_pci_host(), returning 1. This is the default behaviour, since most boards only implement PCI host functionality. This weak default can be overridden by a board specific version if needed. Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'cpu')
-rw-r--r--cpu/ppc4xx/4xx_pci.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/cpu/ppc4xx/4xx_pci.c b/cpu/ppc4xx/4xx_pci.c
index fa521f0..40017f4 100644
--- a/cpu/ppc4xx/4xx_pci.c
+++ b/cpu/ppc4xx/4xx_pci.c
@@ -478,6 +478,26 @@ void pci_init_board(void)
static struct pci_controller ppc440_hose = {0};
+/*
+ * This routine is called to determine if a pci scan should be
+ * performed. With various hardware environments (especially cPCI and
+ * PPMC) it's insufficient to depend on the state of the arbiter enable
+ * bit in the strap register, or generic host/adapter assumptions.
+ *
+ * Rather than hard-code a bad assumption in the general 440 code, the
+ * 440 pci code requires the board to decide at runtime.
+ *
+ * Return 0 for adapter mode, non-zero for host (monarch) mode.
+ *
+ * Weak default implementation: "Normal" boards implement the PCI
+ * host functionality. This can be overridden for PCI adapter boards.
+ */
+int __is_pci_host(struct pci_controller *hose)
+{
+ return 1;
+}
+int is_pci_host(struct pci_controller *hose)
+ __attribute__((weak, alias("__is_pci_host")));
int pci_440_init (struct pci_controller *hose)
{