summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorstroese <stroese>2005-05-03 06:06:41 +0000
committerstroese <stroese>2005-05-03 06:06:41 +0000
commitdcb2f95a60c094d482574fa9fb01001b2e711a4e (patch)
tree62f0182d173886bb45b04cc3b6be66f338220f96 /board
parent9f709b6cee2e567510a59c145bb0814dabefdaa5 (diff)
downloadu-boot-imx-dcb2f95a60c094d482574fa9fb01001b2e711a4e.zip
u-boot-imx-dcb2f95a60c094d482574fa9fb01001b2e711a4e.tar.gz
u-boot-imx-dcb2f95a60c094d482574fa9fb01001b2e711a4e.tar.bz2
* Patch by Stefan Roese, 03 May 2005:
Update for P3G4 Fix problems in cmd_universe.c
Diffstat (limited to 'board')
-rw-r--r--board/evb64260/pci.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/board/evb64260/pci.c b/board/evb64260/pci.c
index 9cd9722..59b9acb 100644
--- a/board/evb64260/pci.c
+++ b/board/evb64260/pci.c
@@ -629,6 +629,7 @@ static void gt_setup_ide (struct pci_controller *hose,
}
}
+#ifndef CONFIG_P3G4
static void gt_fixup_irq (struct pci_controller *hose, pci_dev_t dev)
{
unsigned char pin, irq;
@@ -642,6 +643,7 @@ static void gt_fixup_irq (struct pci_controller *hose, pci_dev_t dev)
pci_write_config_byte (dev, PCI_INTERRUPT_LINE, irq);
}
}
+#endif
struct pci_config_table gt_config_table[] = {
{PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_STORAGE_IDE,
@@ -651,12 +653,16 @@ struct pci_config_table gt_config_table[] = {
};
struct pci_controller pci0_hose = {
+#ifndef CONFIG_P3G4
fixup_irq:gt_fixup_irq,
+#endif
config_table:gt_config_table,
};
struct pci_controller pci1_hose = {
+#ifndef CONFIG_P3G4
fixup_irq:gt_fixup_irq,
+#endif
config_table:gt_config_table,
};
@@ -692,8 +698,10 @@ void pci_init_board (void)
pci_register_hose (&pci0_hose);
+#ifndef CONFIG_P3G4
pciArbiterEnable (PCI_HOST0);
pciParkingDisable (PCI_HOST0, 1, 1, 1, 1, 1, 1, 1);
+#endif
command = pciReadConfigReg (PCI_HOST0, PCI_COMMAND, SELF);
command |= PCI_COMMAND_MASTER;
@@ -735,8 +743,10 @@ void pci_init_board (void)
pci_register_hose (&pci1_hose);
+#ifndef CONFIG_P3G4
pciArbiterEnable (PCI_HOST1);
pciParkingDisable (PCI_HOST1, 1, 1, 1, 1, 1, 1, 1);
+#endif
command = pciReadConfigReg (PCI_HOST1, PCI_COMMAND, SELF);
command |= PCI_COMMAND_MASTER;