Correct fixup relocation for mpc8260

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

diff --git a/board/cogent/u-boot.lds b/board/cogent/u-boot.lds
index 5ce2694cbf7dd85155267f865adc8d13d7a5419e..d87a39b249656b2cae495d8fece9184dff9a268b 100644 (file)
--- a/board/cogent/u-boot.lds
+++ b/board/cogent/u-boot.lds
@@ -55,7 +55,6 @@ SECTIONS
   {
     *(.text)
     common/environment.o(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

diff --git a/board/hymod/u-boot.lds b/board/hymod/u-boot.lds
index 337a3954d2de2a0f10692f76f4e0524bf8028c68..9bf0f0938a2fbf4e14329ce54bdf309ad87037c2 100644 (file)
--- a/board/hymod/u-boot.lds
+++ b/board/hymod/u-boot.lds
@@ -69,7 +69,6 @@ SECTIONS
     common/environment.o(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;

diff --git a/board/rsdproto/u-boot.lds b/board/rsdproto/u-boot.lds
index 70fc3a5d2799034dbc00711a89a4fb91fe9c70bc..9bd6248095267e3af50ebc40e9acaff8a1d27343 100644 (file)
--- a/board/rsdproto/u-boot.lds
+++ b/board/rsdproto/u-boot.lds
@@ -55,7 +55,6 @@ SECTIONS
   {
     cpu/mpc8260/start.o        (.text)
     *(.text)
-    *(.fixup)
     *(.got1)
     /*. = env_offset; */
   }

diff --git a/cpu/mpc8260/config.mk b/cpu/mpc8260/config.mk
index 683b6fbf2b2f16f194d8073a2d2248b63829d361..d401e4ca04f9e43e3f6e915bd8fc13d7ef75c713 100644 (file)
--- a/cpu/mpc8260/config.mk
+++ b/cpu/mpc8260/config.mk
@@ -21,7 +21,7 @@
 # MA 02111-1307 USA
 #
 
-PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi
+PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi -mrelocatable
 
 PLATFORM_CPPFLAGS += -DCONFIG_8260 -DCONFIG_CPM2 -ffixed-r2 -ffixed-r29 \
                     -mstring -mcpu=603e -mmultiple

diff --git a/cpu/mpc8260/u-boot.lds b/cpu/mpc8260/u-boot.lds
index 3e84f234d7226a90886777696f215874bc853092..b8abc17d413bca83f5123077a9c236f17cfbb6dd 100644 (file)
--- a/cpu/mpc8260/u-boot.lds
+++ b/cpu/mpc8260/u-boot.lds
@@ -55,7 +55,6 @@ SECTIONS
   {
     cpu/mpc8260/start.o                (.text)
     *(.text)
-    *(.fixup)
     *(.got1)
     . = ALIGN(16);
     *(.rodata)

diff --git a/include/common.h b/include/common.h
index 4c50053c021becece72b5109723a113c37dc775a..b224e06976b942a5ef1f422654fc0b226e9d2a8b 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -83,6 +83,7 @@ typedef volatile unsigned char        vu_char;
 #define CONFIG_MPC8260 1
 #endif
 #include <asm/immap_8260.h>
+#define CONFIG_RELOC_FIXUP_WORKS
 #endif
 #ifdef CONFIG_MPC86xx
 #include <mpc86xx.h>