Browse Source

Correct fixup relocation for MPC5xxx

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Grant Likely 18 years ago
parent
commit
6f7576b20e
4 changed files with 2 additions and 3 deletions
  1. 1 1
      cpu/mpc5xxx/config.mk
  2. 0 1
      cpu/mpc5xxx/u-boot-customlayout.lds
  3. 0 1
      cpu/mpc5xxx/u-boot.lds
  4. 1 0
      include/common.h

+ 1 - 1
cpu/mpc5xxx/config.mk

@@ -21,7 +21,7 @@
 # MA 02111-1307 USA
 #
 
-PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi
+PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi -mrelocatable
 
 PLATFORM_CPPFLAGS += -DCONFIG_MPC5xxx -ffixed-r2 -ffixed-r29 \
 		     -mstring -mcpu=603e -mmultiple

+ 0 - 1
cpu/mpc5xxx/u-boot-customlayout.lds

@@ -66,7 +66,6 @@ SECTIONS
     common/environment.o        (.ppcenv)
 
     *(.text)
-    *(.fixup)
     *(.got1)
     . = ALIGN(16);
     *(.rodata)

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

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

+ 1 - 0
include/common.h

@@ -66,6 +66,7 @@ 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_MPC8220)
 #include <asm/immap_8220.h>
 #elif defined(CONFIG_8260)