Correct fixup relocation for mpc8220

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

diff --git a/cpu/mpc8220/config.mk b/cpu/mpc8220/config.mk
index 8e3ba54287cbab5b70975f8bba9f847277e91013..c41cafe97fef6c17dda4a48f10500ead4253ec9b 100644 (file)
--- a/cpu/mpc8220/config.mk
+++ b/cpu/mpc8220/config.mk
@@ -21,7 +21,7 @@
 # MA 02111-1307 USA
 #
 
 # MA 02111-1307 USA
 #
 

-PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi
+PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi -mrelocatable

 
 PLATFORM_CPPFLAGS += -DCONFIG_MPC8220 -ffixed-r2 -ffixed-r29 \
                     -mstring -mcpu=603e -mmultiple
 
 PLATFORM_CPPFLAGS += -DCONFIG_MPC8220 -ffixed-r2 -ffixed-r29 \
                     -mstring -mcpu=603e -mmultiple

diff --git a/cpu/mpc8220/u-boot.lds b/cpu/mpc8220/u-boot.lds
index 889bc77d2f820d3af5cb055013a307d0416a850e..a199a64f13183f7db36c41c8baed028debec45b6 100644 (file)
--- a/cpu/mpc8220/u-boot.lds
+++ b/cpu/mpc8220/u-boot.lds
@@ -55,7 +55,6 @@ SECTIONS
   {
     cpu/mpc8220/start.o        (.text)
     *(.text)
   {
     cpu/mpc8220/start.o        (.text)
     *(.text)

-    *(.fixup)

     *(.got1)
     . = ALIGN(16);
     *(.rodata)
     *(.got1)
     . = ALIGN(16);
     *(.rodata)

diff --git a/include/common.h b/include/common.h
index a905072ae3c7481164de2f3fed74c178c610fcf5..93ddfb85eabec3f2f521ff3d0ec785ca2d8033c8 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -69,6 +69,7 @@ typedef volatile unsigned char        vu_char;
 #define CONFIG_RELOC_FIXUP_WORKS
 #elif defined(CONFIG_MPC8220)
 #include <asm/immap_8220.h>
 #define CONFIG_RELOC_FIXUP_WORKS
 #elif defined(CONFIG_MPC8220)
 #include <asm/immap_8220.h>

+#define CONFIG_RELOC_FIXUP_WORKS

 #elif defined(CONFIG_8260)
 #if   defined(CONFIG_MPC8247) \
    || defined(CONFIG_MPC8248) \
 #elif defined(CONFIG_8260)
 #if   defined(CONFIG_MPC8247) \
    || defined(CONFIG_MPC8248) \