ppc: Remove pci config table pointer relocation fixups

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>

diff --git a/board/freescale/mpc8548cds/mpc8548cds.c b/board/freescale/mpc8548cds/mpc8548cds.c
index 80de6f8762b9d8853ffba511c1cfb7ca9f31cdd7..73e7c210935c9af770fa53ca0197ae6bab25dbda 100644 (file)
--- a/board/freescale/mpc8548cds/mpc8548cds.c
+++ b/board/freescale/mpc8548cds/mpc8548cds.c
@@ -276,7 +276,6 @@ pci_init_board(void)
 {
        volatile ccsr_fsl_pci_t *pci = (ccsr_fsl_pci_t *) CONFIG_SYS_PCI1_ADDR;
        struct pci_controller *hose = &pci1_hose;
-       struct pci_config_table *table;
        struct pci_region *r = hose->regions;
 
        uint pci_32 = gur->pordevsr & MPC85xx_PORDEVSR_PCI1_PCI32;      /* PORDEVSR[15] */
@@ -312,12 +311,6 @@ pci_init_board(void)
                               PCI_REGION_IO);
                hose->region_count = r - hose->regions;
 
-               /* relocate config table pointers */
-               hose->config_table = \
-                       (struct pci_config_table *)((uint)hose->config_table + gd->reloc_off);
-               for (table = hose->config_table; table && table->vendor; table++)
-                       table->config_device += gd->reloc_off;
-
                hose->first_busno=first_free_busno;
 
                fsl_pci_init(hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data);

diff --git a/board/mpl/common/pci.c b/board/mpl/common/pci.c
index e0ba620d1f98227db6c6c29df901653fa8135f90..f9bb6ab2bc63238b7989e026b1a08139d80abae4 100644 (file)
--- a/board/mpl/common/pci.c
+++ b/board/mpl/common/pci.c
@@ -94,29 +94,11 @@ static struct pci_controller hose = {
 };
 
 
-static void reloc_pci_cfg_table(struct pci_config_table *table)
-{
-       unsigned long addr;
-
-       for (; table && table->vendor; table++) {
-               addr = (ulong) (table->config_device) + gd->reloc_off;
-#ifdef DEBUG
-               printf ("device \"%d\": 0x%08lx => 0x%08lx\n",
-                               table->device, (ulong) (table->config_device), addr);
-#endif
-               table->config_device =
-                       (void (*)(struct pci_controller* hose, pci_dev_t dev,
-                             struct pci_config_table *))addr;
-               table->priv[0]+=gd->reloc_off;
-       }
-}
-
 void pci_init_board(void)
 {
        /*we want the ptrs to RAM not flash (ie don't use init list)*/
        hose.fixup_irq    = pci_pip405_fixup_irq;
        hose.config_table = pci_pip405_config_table;
-       reloc_pci_cfg_table(hose.config_table);
 #ifdef DEBUG
        printf("Init PCI: fixup_irq=%p config_table=%p hose=%p\n",pci_pip405_fixup_irq,pci_pip405_config_table,hose);
 #endif