Revert "Correct fixup relocation for MPC5xxx"

This reverts commit 6f7576b20e. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
17 years ago · e15633888a
parent 139365fbe5
commit e15633888a
4 changed files with 3 additions and 2 deletions
--- a/cpu/mpc5xxx/config.mk
+++ b/cpu/mpc5xxx/config.mk
@ -21,7 +21,7 @@
 # MA 02111-1307 USA
 #

-PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi -mrelocatable
+PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi

 PLATFORM_CPPFLAGS += -DCONFIG_MPC5xxx -ffixed-r2 -ffixed-r29 \
 		     -mstring -mcpu=603e -mmultiple
--- a/cpu/mpc5xxx/u-boot-customlayout.lds
+++ b/cpu/mpc5xxx/u-boot-customlayout.lds
@ -66,6 +66,7 @@ SECTIONS
    common/environment.o        (.ppcenv)

    *(.text)
+    *(.fixup)
    *(.got1)
    . = ALIGN(16);
    *(.rodata)
--- a/cpu/mpc5xxx/u-boot.lds
+++ b/cpu/mpc5xxx/u-boot.lds
@ -55,6 +55,7 @@ SECTIONS
  {
    cpu/mpc5xxx/start.o	(.text)
    *(.text)
+    *(.fixup)
    *(.got1)
    . = ALIGN(16);
    *(.rodata)
--- a/include/common.h
+++ b/include/common.h
@ -66,7 +66,6 @@ typedef volatile unsigned char	vu_char;
 #define CONFIG_RELOC_FIXUP_WORKS
 #elif defined(CONFIG_MPC5xxx)
 #include <mpc5xxx.h>
-#define CONFIG_RELOC_FIXUP_WORKS
 #elif defined(CONFIG_MPC512X)
 #include <mpc512x.h>
 #include <asm/immap_512x.h>