Merge branch 'next' of git://git.denx.de/u-boot-mpc83xx

[u-boot] / board / mpl / common / pci.c

diff --git a/board/mpl/common/pci.c b/board/mpl/common/pci.c
index bfd642892ba26c65bf78e0496c8c3f95e3ed9f6b..cd969cb5182d4e3bb6a9b4dcaf739f2495f18ae0 100644 (file)
--- a/board/mpl/common/pci.c
+++ b/board/mpl/common/pci.c
@@ -1,23 +1,6 @@
-/*-----------------------------------------------------------------------------+
-|
-|       This source code has been made available to you by IBM on an AS-IS
-|       basis.  Anyone receiving this source is licensed under IBM
-|       copyrights to use it in any way he or she deems fit, including
-|       copying it, modifying it, compiling it, and redistributing it either
-|       with or without modifications.  No license under IBM patents or
-|       patent applications is to be implied by the copyright license.
-|
-|       Any user of this software should understand that IBM cannot provide
-|       technical support for this software and will not be responsible for
-|       any consequences resulting from the use of this software.
-|
-|       Any person who transfers this source code or any derivative work
-|       must include the IBM copyright notice, this paragraph, and the
-|       preceding two paragraphs in the transferred software.
-|
-|       COPYRIGHT   I B M   CORPORATION 1995
-|       LICENSED MATERIAL  -  PROGRAM PROPERTY OF I B M
-+-----------------------------------------------------------------------------*/
+/*
+ * SPDX-License-Identifier:    GPL-2.0 IBM-pibs
+ */
 /*
  * Adapted for PIP405 03.07.01
  * Denis Peter, MPL AG Switzerland, d.peter@mpl.ch
@@ -92,29 +75,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