summaryrefslogtreecommitdiff
path: root/board/mpc8540ads/mpc8540ads.c
diff options
context:
space:
mode:
authorMatthew McClintock <msm@freescale.com>2006-06-28 10:45:41 -0500
committerMatthew McClintock <msm@freescale.com>2006-06-28 10:45:41 -0500
commit52c7a68b8d587ebcf5a6b051b58b3d3ffa377ddc (patch)
tree9b41c2435c11ad367f4ea54dbb3c77e7aeb0954b /board/mpc8540ads/mpc8540ads.c
parent087454609e47295443af793a282cddcd91a5f49c (diff)
downloadu-boot-imx-52c7a68b8d587ebcf5a6b051b58b3d3ffa377ddc.zip
u-boot-imx-52c7a68b8d587ebcf5a6b051b58b3d3ffa377ddc.tar.gz
u-boot-imx-52c7a68b8d587ebcf5a6b051b58b3d3ffa377ddc.tar.bz2
* Fixed PCI memory definitions
Patch by Andy Fleming 17-Mar-2006 Signed-off-by: Andy Fleming <afleming@freescale.com>
Diffstat (limited to 'board/mpc8540ads/mpc8540ads.c')
-rw-r--r--board/mpc8540ads/mpc8540ads.c21
1 files changed, 4 insertions, 17 deletions
diff --git a/board/mpc8540ads/mpc8540ads.c b/board/mpc8540ads/mpc8540ads.c
index 855888d..fbcb397 100644
--- a/board/mpc8540ads/mpc8540ads.c
+++ b/board/mpc8540ads/mpc8540ads.c
@@ -317,24 +317,8 @@ long int fixed_sdram (void)
* Initialize PCI Devices, report devices found.
*/
-#ifndef CONFIG_PCI_PNP
-static struct pci_config_table pci_mpc85xxads_config_table[] = {
- { PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
- PCI_IDSEL_NUMBER, PCI_ANY_ID,
- pci_cfgfunc_config_device, { PCI_ENET0_IOADDR,
- PCI_ENET0_MEMADDR,
- PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER
- } },
- { }
-};
-#endif
-
-static struct pci_controller hose = {
-#ifndef CONFIG_PCI_PNP
- config_table: pci_mpc85xxads_config_table,
-#endif
-};
+static struct pci_controller hose;
#endif /* CONFIG_PCI */
@@ -357,6 +341,9 @@ ft_board_setup(void *blob, bd_t *bd)
u32 *p;
int len;
+#ifdef CONFIG_PCI
+ ft_pci_setup(blob, bd);
+#endif
ft_cpu_setup(blob, bd);
p = ft_get_prop(blob, "/memory/reg", &len);