From: Grant Likely <grant.likely@secretlab.ca>
Date: Tue, 3 Jul 2007 06:34:39 +0000 (-0600)
Subject: Correct fixup relocation for mpc824x
X-Git-Tag: v1.3.0-rc1~19^2~20^2~18^2~110
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f3a52fe05923935db86985daf9438e2f70ac39aa;p=u-boot

Correct fixup relocation for mpc824x

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

diff --git a/board/mousse/u-boot.lds b/board/mousse/u-boot.lds
index 57358b8a49..eb4d8e4e2b 100644
--- a/board/mousse/u-boot.lds
+++ b/board/mousse/u-boot.lds
@@ -60,7 +60,6 @@ SECTIONS
     lib_generic/crc32.o		(.text)
     lib_generic/zlib.o		(.text)
 
-    *(.fixup)
     *(.got1)
     . = ALIGN(16);
     *(.rodata)
diff --git a/cpu/mpc824x/config.mk b/cpu/mpc824x/config.mk
index 66207f4354..17fdb21d35 100644
--- a/cpu/mpc824x/config.mk
+++ b/cpu/mpc824x/config.mk
@@ -21,7 +21,7 @@
 # MA 02111-1307 USA
 #
 
-PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi -fno-strict-aliasing
+PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi -fno-strict-aliasing -mrelocatable
 
 PLATFORM_CPPFLAGS += -DCONFIG_MPC824X -ffixed-r2 -ffixed-r29 -mstring -mcpu=603e -msoft-float
 
diff --git a/cpu/mpc824x/u-boot.lds b/cpu/mpc824x/u-boot.lds
index c90d1e9457..8cbef4aed4 100644
--- a/cpu/mpc824x/u-boot.lds
+++ b/cpu/mpc824x/u-boot.lds
@@ -55,7 +55,6 @@ SECTIONS
   {
     cpu/mpc824x/start.o		(.text)
     *(.text)
-    *(.fixup)
     *(.got1)
     . = ALIGN(16);
     *(.rodata)
diff --git a/include/common.h b/include/common.h
index 93ddfb85ea..4c50053c02 100644
--- a/include/common.h
+++ b/include/common.h
@@ -70,6 +70,8 @@ typedef volatile unsigned char	vu_char;
 #elif defined(CONFIG_MPC8220)
 #include <asm/immap_8220.h>
 #define CONFIG_RELOC_FIXUP_WORKS
+#elif defined(CONFIG_824X)
+#define CONFIG_RELOC_FIXUP_WORKS
 #elif defined(CONFIG_8260)
 #if   defined(CONFIG_MPC8247) \
    || defined(CONFIG_MPC8248) \