From: Grant Likely <grant.likely@secretlab.ca>
Date: Thu, 15 Nov 2007 15:27:52 +0000 (-0700)
Subject: Revert "Correct relocation fixup for mpc5xx"
X-Git-Tag: v1.3.0-rc4~2^2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=955413f35f054a82e40042f1dbcf501c6a05719b;p=oweals%2Fu-boot.git

Revert "Correct relocation fixup for mpc5xx"

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

diff --git a/cpu/mpc5xx/config.mk b/cpu/mpc5xx/config.mk
index e95b8a1a85..64cd60071a 100644
--- a/cpu/mpc5xx/config.mk
+++ b/cpu/mpc5xx/config.mk
@@ -28,7 +28,7 @@
 #
 
 
-PLATFORM_RELFLAGS += 	-fPIC -ffixed-r14 -meabi -mrelocatable
+PLATFORM_RELFLAGS += 	-fPIC -ffixed-r14 -meabi
 
 PLATFORM_CPPFLAGS +=	-DCONFIG_5xx -ffixed-r2 -ffixed-r29 -mpowerpc -msoft-float
 
diff --git a/cpu/mpc5xx/u-boot.lds b/cpu/mpc5xx/u-boot.lds
index 10001b1c1d..5b03fef66c 100644
--- a/cpu/mpc5xx/u-boot.lds
+++ b/cpu/mpc5xx/u-boot.lds
@@ -59,6 +59,7 @@ SECTIONS
     cpu/mpc5xx/start.o	(.text)
 
     *(.text)
+    *(.fixup)
     *(.got1)
   }
   _etext = .;
diff --git a/include/common.h b/include/common.h
index 4bfb8c5627..63ac8b062c 100644
--- a/include/common.h
+++ b/include/common.h
@@ -63,7 +63,6 @@ typedef volatile unsigned char	vu_char;
 #endif
 #elif defined(CONFIG_5xx)
 #include <asm/5xx_immap.h>
-#define CONFIG_RELOC_FIXUP_WORKS
 #elif defined(CONFIG_MPC5xxx)
 #include <mpc5xxx.h>
 #elif defined(CONFIG_MPC512X)