Răsfoiți Sursa

Revert "Correct fixup relocation for mpc83xx"

This reverts commit 057004f4a4863554d56cc56268bfa7c7d9738e27.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Grant Likely 17 ani în urmă
părinte
comite
928fe33b24
3 a modificat fișierele cu 2 adăugiri și 2 ștergeri
  1. 1 1
      cpu/mpc83xx/config.mk
  2. 1 0
      cpu/mpc83xx/u-boot.lds
  3. 0 1
      include/common.h

+ 1 - 1
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

+ 1 - 0
cpu/mpc83xx/u-boot.lds

@@ -52,6 +52,7 @@ SECTIONS
   {
     cpu/mpc83xx/start.o	(.text)
     *(.text)
+    *(.fixup)
     *(.got1)
     . = ALIGN(16);
     *(.rodata)

+ 0 - 1
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>