Browse Source

Revert "Correct fixup relocation for mpc8220"

This reverts commit a85dd254c0577fca13627c46e93fc2ad4c4f1f00.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Grant Likely 17 years ago
parent
commit
139365fbe5
3 changed files with 2 additions and 2 deletions
  1. 1 1
      cpu/mpc8220/config.mk
  2. 1 0
      cpu/mpc8220/u-boot.lds
  3. 0 1
      include/common.h

+ 1 - 1
cpu/mpc8220/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_MPC8220 -ffixed-r2 -ffixed-r29 \
 		     -mstring -mcpu=603e -mmultiple

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

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

+ 0 - 1
include/common.h

@@ -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) \