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

index c41cafe97fef6c17dda4a48f10500ead4253ec9b..8e3ba54287cbab5b70975f8bba9f847277e91013 100644 (file)
@@ -21,7 +21,7 @@
 # MA 02111-1307 USA
 #
 
-PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi -mrelocatable
+PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi
 
 PLATFORM_CPPFLAGS += -DCONFIG_MPC8220 -ffixed-r2 -ffixed-r29 \
                     -mstring -mcpu=603e -mmultiple
index a199a64f13183f7db36c41c8baed028debec45b6..889bc77d2f820d3af5cb055013a307d0416a850e 100644 (file)
@@ -55,6 +55,7 @@ SECTIONS
   {
     cpu/mpc8220/start.o        (.text)
     *(.text)
+    *(.fixup)
     *(.got1)
     . = ALIGN(16);
     *(.rodata)
index 8ba57e8ef3f7a8b37e2c529769ebfc32ea52894d..a4d1f8d962e249ca70aac167d4783e2711e1700e 100644 (file)
@@ -72,7 +72,6 @@ typedef volatile unsigned char        vu_char;
 #include <asm/immap_512x.h>
 #elif defined(CONFIG_MPC8220)
 #include <asm/immap_8220.h>
-#define CONFIG_RELOC_FIXUP_WORKS
 #elif defined(CONFIG_8260)
 #if   defined(CONFIG_MPC8247) \
    || defined(CONFIG_MPC8248) \