summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2007-07-03 00:34:49 -0600
committerWolfgang Denk <wd@denx.de>2007-07-04 01:08:40 +0200
commit057004f4a4863554d56cc56268bfa7c7d9738e27 (patch)
treeb983578ed63a1a63fc82cec9333e2253e7e795e1
parent5af61b2f4b838a05f79be274f3e5a66edd2d9c96 (diff)
downloadu-boot-imx-057004f4a4863554d56cc56268bfa7c7d9738e27.zip
u-boot-imx-057004f4a4863554d56cc56268bfa7c7d9738e27.tar.gz
u-boot-imx-057004f4a4863554d56cc56268bfa7c7d9738e27.tar.bz2
Correct fixup relocation for mpc83xx
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
-rw-r--r--cpu/mpc83xx/config.mk2
-rw-r--r--cpu/mpc83xx/u-boot.lds1
-rw-r--r--include/common.h1
3 files changed, 2 insertions, 2 deletions
diff --git a/cpu/mpc83xx/config.mk b/cpu/mpc83xx/config.mk
index ecf8a60..2ec395d 100644
--- a/cpu/mpc83xx/config.mk
+++ b/cpu/mpc83xx/config.mk
@@ -20,7 +20,7 @@
# MA 02111-1307 USA
#
-PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi
+PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi -mrelocatable
PLATFORM_CPPFLAGS += -DCONFIG_MPC83XX -DCONFIG_E300 \
-ffixed-r2 -ffixed-r29 -msoft-float
diff --git a/cpu/mpc83xx/u-boot.lds b/cpu/mpc83xx/u-boot.lds
index 937c87a..ca663bc 100644
--- a/cpu/mpc83xx/u-boot.lds
+++ b/cpu/mpc83xx/u-boot.lds
@@ -52,7 +52,6 @@ SECTIONS
{
cpu/mpc83xx/start.o (.text)
*(.text)
- *(.fixup)
*(.got1)
. = ALIGN(16);
*(.rodata)
diff --git a/include/common.h b/include/common.h
index b224e06..d89617a 100644
--- a/include/common.h
+++ b/include/common.h
@@ -96,6 +96,7 @@ typedef volatile unsigned char vu_char;
#ifdef CONFIG_MPC83XX
#include <mpc83xx.h>
#include <asm/immap_83xx.h>
+#define CONFIG_RELOC_FIXUP_WORKS
#endif
#ifdef CONFIG_4xx
#include <ppc4xx.h>