From: Grant Likely <grant.likely@secretlab.ca>
Date: Thu, 15 Nov 2007 15:21:04 +0000 (-0700)
Subject: Revert "Correct fixup relocation for mpc8220"
X-Git-Tag: v2008.10-rc1~854
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=139365fbe566d0fc619a1ed04452ec5388f0cef8;p=platform%2Fkernel%2Fu-boot.git

Revert "Correct fixup relocation for mpc8220"

This reverts commit a85dd254c0577fca13627c46e93fc2ad4c4f1f00.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
---

diff --git a/cpu/mpc8220/config.mk b/cpu/mpc8220/config.mk
index c41cafe97f..8e3ba54287 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 -mrelocatable
+PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi
 
 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 a199a64f13..889bc77d2f 100644
--- a/cpu/mpc8220/u-boot.lds
+++ b/cpu/mpc8220/u-boot.lds
@@ -55,6 +55,7 @@ SECTIONS
   {
     cpu/mpc8220/start.o	(.text)
     *(.text)
+    *(.fixup)
     *(.got1)
     . = ALIGN(16);
     *(.rodata)
diff --git a/include/common.h b/include/common.h
index 8ba57e8ef3..a4d1f8d962 100644
--- a/include/common.h
+++ b/include/common.h
@@ -72,7 +72,6 @@ typedef volatile unsigned char	vu_char;
 #include <asm/immap_512x.h>
 #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) \