Correct fixup relocation for mpc83xx

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

diff --git a/cpu/mpc83xx/config.mk b/cpu/mpc83xx/config.mk
index ecf8a60bbefa19441fce6396aa65947e5c52fdc1..2ec395d4ca9d57a7cd59aba67e685e0eea7dde40 100644 (file)
--- a/cpu/mpc83xx/config.mk
+++ b/cpu/mpc83xx/config.mk
@@ -20,7 +20,7 @@
 # MA 02111-1307 USA
 #
 
-PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi
+PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi -mrelocatable
 
 PLATFORM_CPPFLAGS += -DCONFIG_MPC83XX -DCONFIG_E300 \
                        -ffixed-r2 -ffixed-r29 -msoft-float

diff --git a/cpu/mpc83xx/u-boot.lds b/cpu/mpc83xx/u-boot.lds
index 937c87a27cd3ce375c0ec7696c52b1101a5ea573..ca663bc87bf865f895918b0dcb1d17da0f357222 100644 (file)
--- a/cpu/mpc83xx/u-boot.lds
+++ b/cpu/mpc83xx/u-boot.lds
@@ -52,7 +52,6 @@ SECTIONS
   {
     cpu/mpc83xx/start.o        (.text)
     *(.text)
-    *(.fixup)
     *(.got1)
     . = ALIGN(16);
     *(.rodata)

diff --git a/include/common.h b/include/common.h
index b224e06976b942a5ef1f422654fc0b226e9d2a8b..d89617ae2c9d39f2d2702a5ffb56b26a07476369 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -96,6 +96,7 @@ typedef volatile unsigned char        vu_char;
 #ifdef CONFIG_MPC83XX
 #include <mpc83xx.h>
 #include <asm/immap_83xx.h>
+#define CONFIG_RELOC_FIXUP_WORKS
 #endif
 #ifdef CONFIG_4xx
 #include <ppc4xx.h>