summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2007-07-03 00:34:39 -0600
committerWolfgang Denk <wd@denx.de>2007-07-04 01:08:19 +0200
commitf3a52fe05923935db86985daf9438e2f70ac39aa (patch)
tree71aa94d46edddefbf1a811f3a886aafee3b1022f
parenta85dd254c0577fca13627c46e93fc2ad4c4f1f00 (diff)
downloadu-boot-imx-f3a52fe05923935db86985daf9438e2f70ac39aa.zip
u-boot-imx-f3a52fe05923935db86985daf9438e2f70ac39aa.tar.gz
u-boot-imx-f3a52fe05923935db86985daf9438e2f70ac39aa.tar.bz2
Correct fixup relocation for mpc824x
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
-rw-r--r--board/mousse/u-boot.lds1
-rw-r--r--cpu/mpc824x/config.mk2
-rw-r--r--cpu/mpc824x/u-boot.lds1
-rw-r--r--include/common.h2
4 files changed, 3 insertions, 3 deletions
diff --git a/board/mousse/u-boot.lds b/board/mousse/u-boot.lds
index 57358b8..eb4d8e4 100644
--- a/board/mousse/u-boot.lds
+++ b/board/mousse/u-boot.lds
@@ -60,7 +60,6 @@ SECTIONS
lib_generic/crc32.o (.text)
lib_generic/zlib.o (.text)
- *(.fixup)
*(.got1)
. = ALIGN(16);
*(.rodata)
diff --git a/cpu/mpc824x/config.mk b/cpu/mpc824x/config.mk
index 66207f4..17fdb21 100644
--- a/cpu/mpc824x/config.mk
+++ b/cpu/mpc824x/config.mk
@@ -21,7 +21,7 @@
# MA 02111-1307 USA
#
-PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi -fno-strict-aliasing
+PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi -fno-strict-aliasing -mrelocatable
PLATFORM_CPPFLAGS += -DCONFIG_MPC824X -ffixed-r2 -ffixed-r29 -mstring -mcpu=603e -msoft-float
diff --git a/cpu/mpc824x/u-boot.lds b/cpu/mpc824x/u-boot.lds
index c90d1e9..8cbef4a 100644
--- a/cpu/mpc824x/u-boot.lds
+++ b/cpu/mpc824x/u-boot.lds
@@ -55,7 +55,6 @@ SECTIONS
{
cpu/mpc824x/start.o (.text)
*(.text)
- *(.fixup)
*(.got1)
. = ALIGN(16);
*(.rodata)
diff --git a/include/common.h b/include/common.h
index 93ddfb8..4c50053 100644
--- a/include/common.h
+++ b/include/common.h
@@ -70,6 +70,8 @@ typedef volatile unsigned char vu_char;
#elif defined(CONFIG_MPC8220)
#include <asm/immap_8220.h>
#define CONFIG_RELOC_FIXUP_WORKS
+#elif defined(CONFIG_824X)
+#define CONFIG_RELOC_FIXUP_WORKS
#elif defined(CONFIG_8260)
#if defined(CONFIG_MPC8247) \
|| defined(CONFIG_MPC8248) \