Revert "Correct relocation fixup for mpc5xx"

This reverts commit 3649cd99ba. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
17 years ago · 955413f35f
parent e15633888a
commit 955413f35f
3 changed files with 2 additions and 2 deletions
--- a/cpu/mpc5xx/config.mk
+++ b/cpu/mpc5xx/config.mk
@ -28,7 +28,7 @@
 #


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

 PLATFORM_CPPFLAGS +=	-DCONFIG_5xx -ffixed-r2 -ffixed-r29 -mpowerpc -msoft-float

--- a/cpu/mpc5xx/u-boot.lds
+++ b/cpu/mpc5xx/u-boot.lds
@ -59,6 +59,7 @@ SECTIONS
    cpu/mpc5xx/start.o	(.text)

    *(.text)
+    *(.fixup)
    *(.got1)
  }
  _etext = .;
--- a/include/common.h
+++ b/include/common.h
@ -63,7 +63,6 @@ typedef volatile unsigned char	vu_char;
 #endif
 #elif defined(CONFIG_5xx)
 #include <asm/5xx_immap.h>
-#define CONFIG_RELOC_FIXUP_WORKS
 #elif defined(CONFIG_MPC5xxx)
 #include <mpc5xxx.h>
 #elif defined(CONFIG_MPC512X)