Revert "Correct fixup relocation for mpc824x"

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

diff --git a/board/mousse/u-boot.lds b/board/mousse/u-boot.lds
index eb4d8e4e2b61f97586643e2a7c15f4585cf32dc6..57358b8a49dcb69640e30cf2a47be7ccc7e40078 100644 (file)
--- a/board/mousse/u-boot.lds
+++ b/board/mousse/u-boot.lds
@@ -60,6 +60,7 @@ 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 17fdb21d35a170b2c98472a507a2a7b6380e0472..66207f4354dfac4b59089ff895f5b2bfc1248d4e 100644 (file)
--- 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 -mrelocatable
+PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi -fno-strict-aliasing
 
 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 8cbef4aed43805f406743d79d7d7f7f5bb50f2db..c90d1e9457e80a065bb77208cf022a7b456ca958 100644 (file)
--- a/cpu/mpc824x/u-boot.lds
+++ b/cpu/mpc824x/u-boot.lds
@@ -55,6 +55,7 @@ SECTIONS
   {
     cpu/mpc824x/start.o                (.text)
     *(.text)
+    *(.fixup)
     *(.got1)
     . = ALIGN(16);
     *(.rodata)

diff --git a/include/common.h b/include/common.h
index d763cc7e2e5cb47eb30fade64c8d3e093a470e89..8ba57e8ef3f7a8b37e2c529769ebfc32ea52894d 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -73,8 +73,6 @@ 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) \