Revert "Correct fixup relocation for mpc83xx"

This reverts commit 057004f4a4. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2007-11-15 08:20:43 -07:00 · 2007-11-15 08:20:43 -07:00 · 928fe33b24
commit 928fe33b24
parent c93945e8f9
3 changed files with 2 additions and 2 deletions
--- a/cpu/mpc83xx/config.mk
+++ b/cpu/mpc83xx/config.mk
@ -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
--- a/cpu/mpc83xx/u-boot.lds
+++ b/cpu/mpc83xx/u-boot.lds
@ -52,6 +52,7 @@ SECTIONS
  {
    cpu/mpc83xx/start.o	(.text)
    *(.text)
+    *(.fixup)
    *(.got1)
    . = ALIGN(16);
    *(.rodata)
--- a/include/common.h
+++ b/include/common.h
@ -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>