Revert "Correct fixup relocation for mpc83xx"
authorGrant Likely <grant.likely@secretlab.ca>
Thu, 15 Nov 2007 15:20:43 +0000 (08:20 -0700)
committerGrant Likely <grant.likely@secretlab.ca>
Thu, 15 Nov 2007 15:31:17 +0000 (08:31 -0700)
This reverts commit 057004f4a4863554d56cc56268bfa7c7d9738e27.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
cpu/mpc83xx/config.mk
cpu/mpc83xx/u-boot.lds
include/common.h

index 2ec395d4ca9d57a7cd59aba67e685e0eea7dde40..ecf8a60bbefa19441fce6396aa65947e5c52fdc1 100644 (file)
@@ -20,7 +20,7 @@
 # MA 02111-1307 USA
 #
 
-PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi -mrelocatable
+PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi
 
 PLATFORM_CPPFLAGS += -DCONFIG_MPC83XX -DCONFIG_E300 \
                        -ffixed-r2 -ffixed-r29 -msoft-float
index ca663bc87bf865f895918b0dcb1d17da0f357222..937c87a27cd3ce375c0ec7696c52b1101a5ea573 100644 (file)
@@ -52,6 +52,7 @@ SECTIONS
   {
     cpu/mpc83xx/start.o        (.text)
     *(.text)
+    *(.fixup)
     *(.got1)
     . = ALIGN(16);
     *(.rodata)
index 5a63906666a69cdfbfb6444a6557f8d2f5c92bfb..3973ed86c5ee88e417a9dad926f17b5fc81028a8 100644 (file)
@@ -99,7 +99,6 @@ typedef volatile unsigned char        vu_char;
 #ifdef CONFIG_MPC83XX
 #include <mpc83xx.h>
 #include <asm/immap_83xx.h>
-#define CONFIG_RELOC_FIXUP_WORKS
 #endif
 #ifdef CONFIG_4xx
 #include <ppc4xx.h>