Correct fixup relocation for MPC5xxx

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

diff --git a/cpu/mpc5xxx/config.mk b/cpu/mpc5xxx/config.mk
index 0df51babd70b558cb1649bd8031a202e003e3b49..0e861c4a0f8280679d9b96070279304378a11183 100644 (file)
--- 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

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

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

diff --git a/include/common.h b/include/common.h
index 7319c549392b22c4d1dcdce236d719cc1e288971..a905072ae3c7481164de2f3fed74c178c610fcf5 100644 (file)
--- a/include/common.h
+++ b/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)