]> git.sur5r.net Git - u-boot/commitdiff
Revert "Correct fixup relocation for MPC5xxx"
authorGrant Likely <grant.likely@secretlab.ca>
Thu, 15 Nov 2007 15:24:32 +0000 (08:24 -0700)
committerGrant Likely <grant.likely@secretlab.ca>
Thu, 15 Nov 2007 15:31:22 +0000 (08:31 -0700)
This reverts commit 6f7576b20ecf0d040c3ac3b032b5cbc860e38a90.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
cpu/mpc5xxx/config.mk
cpu/mpc5xxx/u-boot-customlayout.lds
cpu/mpc5xxx/u-boot.lds
include/common.h

index 0e861c4a0f8280679d9b96070279304378a11183..0df51babd70b558cb1649bd8031a202e003e3b49 100644 (file)
@@ -21,7 +21,7 @@
 # MA 02111-1307 USA
 #
 
-PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi -mrelocatable
+PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi
 
 PLATFORM_CPPFLAGS += -DCONFIG_MPC5xxx -ffixed-r2 -ffixed-r29 \
                     -mstring -mcpu=603e -mmultiple
index 11079430d57b9bb74edeb3538876b914035f003a..123a14c5aa01dc9c01b5312f3531270b669e44ef 100644 (file)
@@ -66,6 +66,7 @@ SECTIONS
     common/environment.o        (.ppcenv)
 
     *(.text)
+    *(.fixup)
     *(.got1)
     . = ALIGN(16);
     *(.rodata)
index a28a3afc71c000019bff183187ff0fe80c1db135..78818a49ebd753254f09a3b6bc800294267bb44f 100644 (file)
@@ -55,6 +55,7 @@ SECTIONS
   {
     cpu/mpc5xxx/start.o        (.text)
     *(.text)
+    *(.fixup)
     *(.got1)
     . = ALIGN(16);
     *(.rodata)
index a4d1f8d962e249ca70aac167d4783e2711e1700e..4bfb8c5627d41dfadfdd30f30404e5cc1670efd8 100644 (file)
@@ -66,7 +66,6 @@ typedef volatile unsigned char        vu_char;
 #define CONFIG_RELOC_FIXUP_WORKS
 #elif defined(CONFIG_MPC5xxx)
 #include <mpc5xxx.h>
-#define CONFIG_RELOC_FIXUP_WORKS
 #elif defined(CONFIG_MPC512X)
 #include <mpc512x.h>
 #include <asm/immap_512x.h>