Correct fixup relocation for mpc8260

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
18 years ago · 5af61b2f4b
parent f3a52fe059
commit 5af61b2f4b
6 changed files with 2 additions and 5 deletions
--- a/board/cogent/u-boot.lds
+++ b/board/cogent/u-boot.lds
@ -55,7 +55,6 @@ SECTIONS
  {
    *(.text)
    common/environment.o(.text)
-    *(.fixup)
    *(.got1)
  }
  _etext = .;
--- a/board/hymod/u-boot.lds
+++ b/board/hymod/u-boot.lds
@ -69,7 +69,6 @@ SECTIONS
    common/environment.o(.text)

    *(.text)
-    *(.fixup)
    *(.got1)
  }
  _etext = .;
--- a/board/rsdproto/u-boot.lds
+++ b/board/rsdproto/u-boot.lds
@ -55,7 +55,6 @@ SECTIONS
  {
    cpu/mpc8260/start.o	(.text)
    *(.text)
-    *(.fixup)
    *(.got1)
    /*. = env_offset; */
  }
--- a/cpu/mpc8260/config.mk
+++ b/cpu/mpc8260/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_8260 -DCONFIG_CPM2 -ffixed-r2 -ffixed-r29 \
 		     -mstring -mcpu=603e -mmultiple
--- a/cpu/mpc8260/u-boot.lds
+++ b/cpu/mpc8260/u-boot.lds
@ -55,7 +55,6 @@ SECTIONS
  {
    cpu/mpc8260/start.o		(.text)
    *(.text)
-    *(.fixup)
    *(.got1)
    . = ALIGN(16);
    *(.rodata)
--- a/include/common.h
+++ b/include/common.h
@ -83,6 +83,7 @@ typedef volatile unsigned char	vu_char;
 #define CONFIG_MPC8260	1
 #endif
 #include <asm/immap_8260.h>
+#define CONFIG_RELOC_FIXUP_WORKS
 #endif
 #ifdef CONFIG_MPC86xx
 #include <mpc86xx.h>