|
@@ -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);
|