Merge branch 'reloc'

board/LEOX/elpt860/u-boot.lds

@@ -80,7 +80,6 @@ SECTIONS
     common/env_embedded.o		(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/LEOX/elpt860/u-boot.lds.debug

@@ -73,7 +73,6 @@ SECTIONS
     common/env_embedded.o	(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/MAI/AmigaOneG3SE/u-boot.lds

@@ -65,7 +65,6 @@ SECTIONS
     common/env_embedded.o(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/Marvell/db64360/u-boot.lds

@@ -63,7 +63,6 @@ SECTIONS
 /*    common/env_embedded.o(.text) */
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/Marvell/db64460/u-boot.lds

@@ -63,7 +63,6 @@ SECTIONS
 /*    common/env_embedded.o(.text) */
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/RPXClassic/u-boot.lds

@@ -67,7 +67,6 @@ SECTIONS
     common/env_embedded.o(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/RPXClassic/u-boot.lds.debug

@@ -64,7 +64,6 @@ SECTIONS
     common/env_embedded.o(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/RPXlite/u-boot.lds

@@ -67,7 +67,6 @@ SECTIONS
     common/env_embedded.o(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/RPXlite/u-boot.lds.debug

@@ -64,7 +64,6 @@ SECTIONS
     common/env_embedded.o(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/RPXlite_dw/u-boot.lds

@@ -67,7 +67,6 @@ SECTIONS
     common/env_embedded.o(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/RPXlite_dw/u-boot.lds.debug

@@ -64,7 +64,6 @@ SECTIONS
     common/env_embedded.o(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/RRvision/u-boot.lds

@@ -69,7 +69,6 @@ SECTIONS
     common/env_embedded.o	(.ppcenv)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/adder/u-boot.lds

@@ -54,7 +54,6 @@ SECTIONS
   {
     cpu/mpc8xx/start.o	(.text)
     *(.text)
-    *(.fixup)
     *(.got1)
     . = ALIGN(16);
     *(.eh_frame)

board/amcc/acadia/u-boot-nand.lds

@@ -62,7 +62,6 @@ SECTIONS
     . = ALIGN(0x10000);
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/amcc/acadia/u-boot.lds

@@ -63,7 +63,6 @@ SECTIONS
     cpu/ppc4xx/start.o	(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/amcc/bamboo/u-boot-nand.lds

@@ -62,7 +62,6 @@ SECTIONS
     . = ALIGN(0x10000);
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/amcc/bamboo/u-boot.lds

@@ -70,7 +70,6 @@ SECTIONS
     board/amcc/bamboo/bamboo.o	(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/amcc/bubinga/u-boot.lds

@@ -63,7 +63,6 @@ SECTIONS
     cpu/ppc4xx/start.o	(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/amcc/canyonlands/u-boot-nand.lds

@@ -62,7 +62,6 @@ SECTIONS
     . = ALIGN(0x80000);
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/amcc/canyonlands/u-boot.lds

@@ -69,7 +69,6 @@ SECTIONS
     board/amcc/canyonlands/init.o	(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/amcc/ebony/u-boot.lds

@@ -69,7 +69,6 @@ SECTIONS
     board/amcc/ebony/init.o	(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/amcc/katmai/u-boot.lds

@@ -66,7 +66,6 @@ SECTIONS
     board/amcc/katmai/init.o	(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/amcc/kilauea/u-boot-nand.lds

@@ -62,7 +62,6 @@ SECTIONS
     . = ALIGN(0x10000);
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/amcc/kilauea/u-boot.lds

@@ -64,7 +64,6 @@ SECTIONS
     cpu/ppc4xx/start.o	(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/amcc/luan/u-boot.lds

@@ -69,7 +69,6 @@ SECTIONS
     board/amcc/luan/init.o	(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/amcc/makalu/u-boot.lds

@@ -64,7 +64,6 @@ SECTIONS
     cpu/ppc4xx/start.o	(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/amcc/ocotea/u-boot.lds

@@ -69,7 +69,6 @@ SECTIONS
     board/amcc/ocotea/init.o	(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/amcc/redwood/u-boot.lds

@@ -73,7 +73,6 @@ SECTIONS
 /*    common/env_embedded.o(.text)*/
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/amcc/sequoia/u-boot-nand.lds

@@ -62,7 +62,6 @@ SECTIONS
     . = ALIGN(0x10000);
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/amcc/sequoia/u-boot-ram.lds

@@ -53,7 +53,6 @@ SECTIONS
     cpu/ppc4xx/start.o	(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/amcc/sequoia/u-boot.lds

@@ -68,7 +68,6 @@ SECTIONS
     cpu/ppc4xx/start.o	(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/amcc/taihu/u-boot.lds

@@ -63,7 +63,6 @@ SECTIONS
     cpu/ppc4xx/start.o	(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/amcc/taishan/u-boot.lds

@@ -69,7 +69,6 @@ SECTIONS
     board/amcc/taishan/init.o	(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/amcc/walnut/u-boot.lds

@@ -63,7 +63,6 @@ SECTIONS
     cpu/ppc4xx/start.o	(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/amcc/yosemite/u-boot.lds

@@ -69,7 +69,6 @@ SECTIONS
     board/amcc/yosemite/init.o	(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/amcc/yucca/u-boot.lds

@@ -69,7 +69,6 @@ SECTIONS
     board/amcc/yucca/init.o	(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/amirix/ap1000/u-boot.lds

@@ -72,7 +72,6 @@ SECTIONS
 /*    common/env_embedded.o(.text)*/
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/c2mon/u-boot.lds

@@ -66,7 +66,6 @@ SECTIONS
     common/env_embedded.o(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/c2mon/u-boot.lds.debug

@@ -64,7 +64,6 @@ SECTIONS
     common/env_embedded.o(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/cm5200/u-boot.lds

@@ -52,7 +52,6 @@ SECTIONS
   {
     cpu/mpc5xxx/start.o	(.text)
     *(.text)
-    *(.fixup)
     *(.got1)
     . = ALIGN(16);
     *(.eh_frame)

board/cogent/u-boot.lds

@@ -54,7 +54,6 @@ SECTIONS
   {
     *(.text)
     common/env_embedded.o(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/cogent/u-boot.lds.debug

@@ -64,7 +64,6 @@ SECTIONS
     common/env_embedded.o(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/cray/L1/u-boot.lds

@@ -78,7 +78,6 @@ SECTIONS
     common/env_embedded.o(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/cray/L1/u-boot.lds.debug

@@ -64,7 +64,6 @@ SECTIONS
     common/env_embedded.o(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/csb272/u-boot.lds

@@ -79,7 +79,6 @@ SECTIONS
 /*    common/env_embedded.o(.text)*/
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/csb472/u-boot.lds

@@ -79,7 +79,6 @@ SECTIONS
 /*    common/env_embedded.o(.text)*/
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/dave/PPChameleonEVB/u-boot.lds

@@ -73,7 +73,6 @@ SECTIONS
     lib_generic/zlib.o		(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/digsy_mtc/cmd_mtc.c

@@ -320,36 +320,6 @@ static int do_mtc_help(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 			ARRAY_SIZE(cmd_mtc_sub), cmdtp, flag, argc, argv);
 }
 
-/* Relocate the command table function pointers when running in RAM */
-int mtc_cmd_init_r(void)
-{
-	cmd_tbl_t *cmdtp;
-
-	for (cmdtp = &cmd_mtc_sub[0]; cmdtp !=
-	     &cmd_mtc_sub[ARRAY_SIZE(cmd_mtc_sub)]; cmdtp++) {
-		ulong addr;
-
-		addr = (ulong)(cmdtp->cmd) + gd->reloc_off;
-		cmdtp->cmd =
-		    (int (*)(struct cmd_tbl_s *, int, int, char *[]))addr;
-
-		addr = (ulong)(cmdtp->name) + gd->reloc_off;
-		cmdtp->name = (char *)addr;
-
-		if (cmdtp->usage) {
-			addr = (ulong)(cmdtp->usage) + gd->reloc_off;
-			cmdtp->usage = (char *)addr;
-		}
-#ifdef CONFIG_SYS_LONGHELP
-		if (cmdtp->help) {
-			addr = (ulong)(cmdtp->help) + gd->reloc_off;
-			cmdtp->help = (char *)addr;
-		}
-#endif
-	}
-	return 0;
-}
-
 int cmd_mtc(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
 	cmd_tbl_t *c;

board/digsy_mtc/digsy_mtc.c

@@ -240,7 +240,6 @@ void board_get_enetaddr (uchar * enet)
 
 int misc_init_r(void)
 {
-	extern int mtc_cmd_init_r (void);
 	uchar enetaddr[6];
 
 	if (!eth_getenv_enetaddr("ethaddr", enetaddr)) {
@@ -248,7 +247,6 @@ int misc_init_r(void)
 		eth_setenv_enetaddr("ethaddr", enetaddr);
 	}
 
-	mtc_cmd_init_r();
 	return 0;
 }
 

board/eltec/bab7xx/u-boot.lds

@@ -63,7 +63,6 @@ SECTIONS
 /*    common/env_embedded.o(.text) */
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/eltec/elppc/u-boot.lds

@@ -63,7 +63,6 @@ SECTIONS
 /*    common/env_embedded.o(.text) */
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/eltec/mhpc/u-boot.lds

@@ -56,7 +56,6 @@ SECTIONS
     common/env_embedded.o(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/eltec/mhpc/u-boot.lds.debug

@@ -64,7 +64,6 @@ SECTIONS
     common/env_embedded.o(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/emk/top860/u-boot.lds

@@ -55,7 +55,6 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/emk/top860/u-boot.lds.debug

@@ -65,7 +65,6 @@ SECTIONS
     common/env_embedded.o(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/ep88x/u-boot.lds

@@ -54,7 +54,6 @@ SECTIONS
   {
     cpu/mpc8xx/start.o	(.text)
     *(.text)
-    *(.fixup)
     *(.got1)
     . = ALIGN(16);
     *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))

board/eric/u-boot.lds

@@ -78,7 +78,6 @@ SECTIONS
     common/env_embedded.o(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/esd/adciop/u-boot.lds

@@ -60,7 +60,6 @@ SECTIONS
     cpu/ppc4xx/start.o	(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/esd/apc405/u-boot.lds

@@ -60,7 +60,6 @@ SECTIONS
     cpu/ppc4xx/start.o	(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/esd/ar405/u-boot.lds

@@ -60,7 +60,6 @@ SECTIONS
     cpu/ppc4xx/start.o		(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/esd/ash405/u-boot.lds

@@ -60,7 +60,6 @@ SECTIONS
     cpu/ppc4xx/start.o	(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/esd/canbt/u-boot.lds

@@ -60,7 +60,6 @@ SECTIONS
     cpu/ppc4xx/start.o		(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/esd/cms700/u-boot.lds

@@ -60,7 +60,6 @@ SECTIONS
     cpu/ppc4xx/start.o	(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/esd/cpci2dp/u-boot.lds

@@ -60,7 +60,6 @@ SECTIONS
     cpu/ppc4xx/start.o	(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/esd/cpci405/u-boot.lds

@@ -60,7 +60,6 @@ SECTIONS
     cpu/ppc4xx/start.o	(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/esd/cpci750/u-boot.lds

@@ -63,7 +63,6 @@ SECTIONS
 /*    common/env_embedded.o(.text) */
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/esd/cpciiser4/u-boot.lds

@@ -60,7 +60,6 @@ SECTIONS
     cpu/ppc4xx/start.o	(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/esd/dasa_sim/u-boot.lds

@@ -63,7 +63,6 @@ SECTIONS
     common/env_embedded.o(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/esd/dp405/u-boot.lds

@@ -60,7 +60,6 @@ SECTIONS
     cpu/ppc4xx/start.o	(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/esd/du405/u-boot.lds

@@ -60,7 +60,6 @@ SECTIONS
     cpu/ppc4xx/start.o	(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/esd/du440/u-boot.lds

@@ -65,7 +65,6 @@ SECTIONS
     cpu/ppc4xx/start.o	(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/esd/hh405/u-boot.lds

@@ -60,7 +60,6 @@ SECTIONS
     cpu/ppc4xx/start.o	(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/esd/hub405/u-boot.lds

@@ -60,7 +60,6 @@ SECTIONS
     cpu/ppc4xx/start.o	(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/esd/ocrtc/u-boot.lds

@@ -75,7 +75,6 @@ SECTIONS
 /*    common/env_embedded.o(.text)*/
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/esd/pci405/u-boot.lds

@@ -60,7 +60,6 @@ SECTIONS
     cpu/ppc4xx/start.o	(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/esd/plu405/u-boot.lds

@@ -60,7 +60,6 @@ SECTIONS
     cpu/ppc4xx/start.o	(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/esd/pmc405/u-boot.lds

@@ -60,7 +60,6 @@ SECTIONS
     cpu/ppc4xx/start.o	(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/esd/pmc405de/u-boot.lds

@@ -60,7 +60,6 @@ SECTIONS
     cpu/ppc4xx/start.o	(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/esd/pmc440/fpga.c

@@ -442,9 +442,9 @@ int pmc440_init_fpga(void)
 {
 	char *s;
 
-	debug("%s:%d: Initialize FPGA interface (relocation offset = 0x%.8lx)\n",
+	debug("%s:%d: Initialize FPGA interface\n",
-	      __FUNCTION__, __LINE__, gd->reloc_off);
+	      __FUNCTION__, __LINE__);
-	fpga_init(gd->reloc_off);
+	fpga_init();
 
 	fpga_serialslave_init ();
 	debug("%s:%d: Adding fpga 0\n", __FUNCTION__, __LINE__);

board/esd/pmc440/u-boot-nand.lds

@@ -62,7 +62,6 @@ SECTIONS
     . = ALIGN(0x10000);
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/esd/pmc440/u-boot.lds

@@ -65,7 +65,6 @@ SECTIONS
     cpu/ppc4xx/start.o	(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/esd/voh405/u-boot.lds

@@ -60,7 +60,6 @@ SECTIONS
     cpu/ppc4xx/start.o	(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/esd/vom405/u-boot.lds

@@ -60,7 +60,6 @@ SECTIONS
     cpu/ppc4xx/start.o	(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/esd/wuh405/u-boot.lds

@@ -60,7 +60,6 @@ SECTIONS
     cpu/ppc4xx/start.o	(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/esteem192e/u-boot.lds

@@ -66,7 +66,6 @@ SECTIONS
     common/env_embedded.o(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/etx094/u-boot.lds

@@ -68,7 +68,6 @@ SECTIONS
     . = env_offset;
     common/env_embedded.o(.text)
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/etx094/u-boot.lds.debug

@@ -71,7 +71,6 @@ SECTIONS
     common/env_embedded.o(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/evb64260/u-boot.lds

@@ -63,7 +63,6 @@ SECTIONS
 /*    common/env_embedded.o(.text) */
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/exbitgen/u-boot.lds

@@ -77,7 +77,6 @@ SECTIONS
     common/env_embedded.o(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/fads/u-boot.lds

@@ -56,7 +56,6 @@ SECTIONS
     common/env_embedded.o	(.ppcenv)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/fads/u-boot.lds.debug

@@ -65,7 +65,6 @@ SECTIONS
     common/env_embedded.o(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/flagadm/u-boot.lds

@@ -55,7 +55,6 @@ SECTIONS
     cpu/mpc8xx/start.o	(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/flagadm/u-boot.lds.debug

@@ -64,7 +64,6 @@ SECTIONS
     common/env_embedded.o(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/freescale/mpc7448hpc2/u-boot.lds

@@ -63,7 +63,6 @@ SECTIONS
 /*    common/env_embedded.o(.text) */
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

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

board/freescale/mpc8610hpcd/u-boot.lds

@@ -61,7 +61,6 @@ SECTIONS
     lib_ppc/extable.o (.text)
     lib_generic/zlib.o (.text)
     *(.text)
-    *(.fixup)
     *(.got1)
    }
     _etext = .;

board/freescale/mpc8641hpcn/u-boot.lds

@@ -62,7 +62,6 @@ SECTIONS
     lib_generic/zlib.o (.text)
     drivers/bios_emulator/atibios.o (.text)
     *(.text)
-    *(.fixup)
     *(.got1)
    }
     _etext = .;

board/g2000/u-boot.lds

@@ -60,7 +60,6 @@ SECTIONS
     cpu/ppc4xx/start.o	(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/gdsys/dlvision/u-boot.lds

@@ -60,7 +60,6 @@ SECTIONS
     cpu/ppc4xx/start.o	(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

board/gdsys/gdppc440etx/u-boot.lds

@@ -69,7 +69,6 @@ SECTIONS
     board/gdsys/gdppc440etx/init.o	(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;