Revert "[MPC512x] Correct fixup relocation"

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

diff --git a/board/ads5121/u-boot.lds b/board/ads5121/u-boot.lds
index 34ceb0fdac45cd08c8529c312d08564e8fdec8fb..038d84955316ae362a6ce25e4a5e54ae82af73ee 100644 (file)
--- a/board/ads5121/u-boot.lds
+++ b/board/ads5121/u-boot.lds
@@ -51,6 +51,7 @@ SECTIONS
   {
     cpu/mpc512x/start.o        (.text)
     *(.text)
+    *(.fixup)
     *(.got1)
     . = ALIGN(16);
     *(.rodata)

diff --git a/cpu/mpc512x/config.mk b/cpu/mpc512x/config.mk
index 3259d53a13f83c3666ba6cd1b26cfa289df2040b..8a07c5a3b679cc4c0308c32de290ab70eb4d661a 100644 (file)
--- a/cpu/mpc512x/config.mk
+++ b/cpu/mpc512x/config.mk
@@ -19,7 +19,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston,
 # MA 02111-1307 USA
 #
-PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi -mrelocatable
+PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi
 
 PLATFORM_CPPFLAGS += -DCONFIG_MPC512X -DCONFIG_E300 \
                        -ffixed-r2 -ffixed-r29 -msoft-float -mcpu=603e

diff --git a/include/common.h b/include/common.h
index aca281bdad6ad2064011a797cd6d88118d0c9ad8..5a63906666a69cdfbfb6444a6557f8d2f5c92bfb 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -70,7 +70,6 @@ typedef volatile unsigned char        vu_char;
 #elif defined(CONFIG_MPC512X)
 #include <mpc512x.h>
 #include <asm/immap_512x.h>
-#define CONFIG_RELOC_FIXUP_WORKS
 #elif defined(CONFIG_MPC8220)
 #include <asm/immap_8220.h>
 #define CONFIG_RELOC_FIXUP_WORKS