Revert "Correct fixup relocation for mpc8260"

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

Revert "Correct fixup relocation for mpc8260"
This reverts commit 5af61b2f4b838a05f79be274f3e5a66edd2d9c96. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Grant Likely
1 parent 928fe33b24
Showing 6 changed files with 5 additions and 2 deletions Side-by-side Diff
board/cogent/u-boot.lds
board/hymod/u-boot.lds
board/rsdproto/u-boot.lds
cpu/mpc8260/config.mk
cpu/mpc8260/u-boot.lds
include/common.h
@@ -55,6 +55,7 @@
   {
     *(.text)
     common/environment.o(.text)
+    *(.fixup)
     *(.got1)
   }
   _etext = .;
@@ -69,6 +69,7 @@
     common/environment.o(.text)
  
     *(.text)
+    *(.fixup)
     *(.got1)
   }
   _etext = .;
@@ -55,6 +55,7 @@
   {
     cpu/mpc8260/start.o	(.text)
     *(.text)
+    *(.fixup)
     *(.got1)
     /*. = env_offset; */
   }
@@ -21,7 +21,7 @@
 # MA 02111-1307 USA
 #
  
-PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi -mrelocatable
+PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi
  
 PLATFORM_CPPFLAGS += -DCONFIG_8260 -DCONFIG_CPM2 -ffixed-r2 -ffixed-r29 \
 		     -mstring -mcpu=603e -mmultiple
@@ -55,6 +55,7 @@
   {
     cpu/mpc8260/start.o		(.text)
     *(.text)
+    *(.fixup)
     *(.got1)
     . = ALIGN(16);
     *(.rodata)
@@ -86,7 +86,6 @@
 #define CONFIG_MPC8260	1
 #endif
 #include <asm/immap_8260.h>
-#define CONFIG_RELOC_FIXUP_WORKS
 #endif
 #ifdef CONFIG_MPC86xx
 #include <mpc86xx.h>
...	...	@@ -55,6 +55,7 @@
55	55	{
56	56	*(.text)
57	57	common/environment.o(.text)
	58	+ *(.fixup)
58	59	*(.got1)
59	60	}
60	61	_etext = .;
...	...	@@ -69,6 +69,7 @@
69	69	common/environment.o(.text)
70	70
71	71	*(.text)
	72	+ *(.fixup)
72	73	*(.got1)
73	74	}
74	75	_etext = .;
...	...	@@ -55,6 +55,7 @@
55	55	{
56	56	cpu/mpc8260/start.o (.text)
57	57	*(.text)
	58	+ *(.fixup)
58	59	*(.got1)
59	60	/. = env_offset; /
60	61	}
...	...	@@ -21,7 +21,7 @@
21	21	# MA 02111-1307 USA
22	22	#
23	23
24		-PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi -mrelocatable
	24	+PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi
25	25
26	26	PLATFORM_CPPFLAGS += -DCONFIG_8260 -DCONFIG_CPM2 -ffixed-r2 -ffixed-r29 \
27	27	-mstring -mcpu=603e -mmultiple
...	...	@@ -86,7 +86,6 @@
86	86	#define CONFIG_MPC8260 1
87	87	#endif
88	88	#include <asm/immap_8260.h>
89		-#define CONFIG_RELOC_FIXUP_WORKS
90	89	#endif
91	90	#ifdef CONFIG_MPC86xx
92	91	#include <mpc86xx.h>