From: Grant Likely <grant.likely@secretlab.ca>
Date: Tue, 3 Jul 2007 06:34:34 +0000 (-0600)
Subject: Correct fixup relocation for mpc8220
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a85dd254c0577fca13627c46e93fc2ad4c4f1f00;p=project%2Fbcm63xx%2Fu-boot.git

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 8e3ba54287..c41cafe97f 100644
--- a/cpu/mpc8220/config.mk
+++ b/cpu/mpc8220/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_MPC8220 -ffixed-r2 -ffixed-r29 \
 		     -mstring -mcpu=603e -mmultiple
diff --git a/cpu/mpc8220/u-boot.lds b/cpu/mpc8220/u-boot.lds
index 889bc77d2f..a199a64f13 100644
--- a/cpu/mpc8220/u-boot.lds
+++ b/cpu/mpc8220/u-boot.lds
@@ -55,7 +55,6 @@ SECTIONS
   {
     cpu/mpc8220/start.o	(.text)
     *(.text)
-    *(.fixup)
     *(.got1)
     . = ALIGN(16);
     *(.rodata)
diff --git a/include/common.h b/include/common.h
index a905072ae3..93ddfb85ea 100644
--- 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_8260)
 #if   defined(CONFIG_MPC8247) \
    || defined(CONFIG_MPC8248) \