summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2007-11-15 08:20:50 -0700
committerGrant Likely <grant.likely@secretlab.ca>2007-11-15 08:31:18 -0700
commit96279ab4cad60cb5972aa934fbe4845ac02cc75a (patch)
tree7e9729c604392c865a505f7fbe570237ad531159 /cpu
parent928fe33b24cdf382a8dc8687fed24b1961cdb5d6 (diff)
downloadu-boot-imx-96279ab4cad60cb5972aa934fbe4845ac02cc75a.zip
u-boot-imx-96279ab4cad60cb5972aa934fbe4845ac02cc75a.tar.gz
u-boot-imx-96279ab4cad60cb5972aa934fbe4845ac02cc75a.tar.bz2
Revert "Correct fixup relocation for mpc8260"
This reverts commit 5af61b2f4b838a05f79be274f3e5a66edd2d9c96. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'cpu')
-rw-r--r--cpu/mpc8260/config.mk2
-rw-r--r--cpu/mpc8260/u-boot.lds1
2 files changed, 2 insertions, 1 deletions
diff --git a/cpu/mpc8260/config.mk b/cpu/mpc8260/config.mk
index d401e4c..683b6fb 100644
--- a/cpu/mpc8260/config.mk
+++ b/cpu/mpc8260/config.mk
@@ -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
diff --git a/cpu/mpc8260/u-boot.lds b/cpu/mpc8260/u-boot.lds
index b8abc17..3e84f23 100644
--- a/cpu/mpc8260/u-boot.lds
+++ b/cpu/mpc8260/u-boot.lds
@@ -55,6 +55,7 @@ SECTIONS
{
cpu/mpc8260/start.o (.text)
*(.text)
+ *(.fixup)
*(.got1)
. = ALIGN(16);
*(.rodata)