commit 6f7576b20ecf0d040c3ac3b032b5cbc860e38a90
author Grant Likely <grant.likely@secretlab.ca> Tue Jul 03 00:34:29 2007 -0600
committer Wolfgang Denk <wd@denx.de> Wed Jul 04 01:07:40 2007 +0200
tree 18d2ee2d277dbe8e1dba39d1a15e955830e9153b
parent 3649cd99ba815b6601868735765602f00ef3692b

Correct fixup relocation for MPC5xxx

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

cpu/mpc5xxx/config.mk

diff --git a/cpu/mpc5xxx/config.mk b/cpu/mpc5xxx/config.mk
index 0df51ba..0e861c4 100644
--- a/cpu/mpc5xxx/config.mk
+++ b/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

cpu/mpc5xxx/u-boot-customlayout.lds

diff --git a/cpu/mpc5xxx/u-boot-customlayout.lds b/cpu/mpc5xxx/u-boot-customlayout.lds
index 123a14c..1107943 100644
--- a/cpu/mpc5xxx/u-boot-customlayout.lds
+++ b/cpu/mpc5xxx/u-boot-customlayout.lds
@@ -66,7 +66,6 @@
     common/environment.o        (.ppcenv)
 
     *(.text)
-    *(.fixup)
     *(.got1)
     . = ALIGN(16);
     *(.rodata)

cpu/mpc5xxx/u-boot.lds

diff --git a/cpu/mpc5xxx/u-boot.lds b/cpu/mpc5xxx/u-boot.lds
index 78818a4..a28a3af 100644
--- a/cpu/mpc5xxx/u-boot.lds
+++ b/cpu/mpc5xxx/u-boot.lds
@@ -55,7 +55,6 @@
   {
     cpu/mpc5xxx/start.o	(.text)
     *(.text)
-    *(.fixup)
     *(.got1)
     . = ALIGN(16);
     *(.rodata)

include/common.h

diff --git a/include/common.h b/include/common.h
index 7319c54..a905072 100644
--- a/include/common.h
+++ b/include/common.h
@@ -66,6 +66,7 @@
 #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)