Pārlūkot izejas kodu

Correct fixup relocation for mpc824x

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Grant Likely 18 gadi atpakaļ
vecāks
revīzija
f3a52fe059
4 mainītis faili ar 3 papildinājumiem un 3 dzēšanām
  1. 0 1
      board/mousse/u-boot.lds
  2. 1 1
      cpu/mpc824x/config.mk
  3. 0 1
      cpu/mpc824x/u-boot.lds
  4. 2 0
      include/common.h

+ 0 - 1
board/mousse/u-boot.lds

@@ -60,7 +60,6 @@ SECTIONS
     lib_generic/crc32.o		(.text)
     lib_generic/zlib.o		(.text)
 
-    *(.fixup)
     *(.got1)
     . = ALIGN(16);
     *(.rodata)

+ 1 - 1
cpu/mpc824x/config.mk

@@ -21,7 +21,7 @@
 # MA 02111-1307 USA
 #
 
-PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi -fno-strict-aliasing
+PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi -fno-strict-aliasing -mrelocatable
 
 PLATFORM_CPPFLAGS += -DCONFIG_MPC824X -ffixed-r2 -ffixed-r29 -mstring -mcpu=603e -msoft-float
 

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

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

+ 2 - 0
include/common.h

@@ -70,6 +70,8 @@ typedef volatile unsigned char	vu_char;
 #elif defined(CONFIG_MPC8220)
 #include <asm/immap_8220.h>
 #define CONFIG_RELOC_FIXUP_WORKS
+#elif defined(CONFIG_824X)
+#define CONFIG_RELOC_FIXUP_WORKS
 #elif defined(CONFIG_8260)
 #if   defined(CONFIG_MPC8247) \
    || defined(CONFIG_MPC8248) \