浏览代码

Revert "Correct fixup relocation for MPC5xxx"

This reverts commit 6f7576b20ecf0d040c3ac3b032b5cbc860e38a90.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Grant Likely 17 年之前
父节点
当前提交
e15633888a
共有 4 个文件被更改,包括 3 次插入2 次删除
  1. 1 1
      cpu/mpc5xxx/config.mk
  2. 1 0
      cpu/mpc5xxx/u-boot-customlayout.lds
  3. 1 0
      cpu/mpc5xxx/u-boot.lds
  4. 0 1
      include/common.h

+ 1 - 1
cpu/mpc5xxx/config.mk

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

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

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

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

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

+ 0 - 1
include/common.h

@@ -66,7 +66,6 @@ typedef volatile unsigned char	vu_char;
 #define CONFIG_RELOC_FIXUP_WORKS
 #define CONFIG_RELOC_FIXUP_WORKS
 #elif defined(CONFIG_MPC5xxx)
 #elif defined(CONFIG_MPC5xxx)
 #include <mpc5xxx.h>
 #include <mpc5xxx.h>
-#define CONFIG_RELOC_FIXUP_WORKS
 #elif defined(CONFIG_MPC512X)
 #elif defined(CONFIG_MPC512X)
 #include <mpc512x.h>
 #include <mpc512x.h>
 #include <asm/immap_512x.h>
 #include <asm/immap_512x.h>