summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2007-11-15 08:20:57 -0700
committerGrant Likely <grant.likely@secretlab.ca>2007-11-15 08:31:19 -0700
commit70922342369e5e39b286fe21e768a239ca07a514 (patch)
treecce6437015513429fcab46a9abe866b51ed6e7ff
parent96279ab4cad60cb5972aa934fbe4845ac02cc75a (diff)
downloadu-boot-imx-70922342369e5e39b286fe21e768a239ca07a514.zip
u-boot-imx-70922342369e5e39b286fe21e768a239ca07a514.tar.gz
u-boot-imx-70922342369e5e39b286fe21e768a239ca07a514.tar.bz2
Revert "Correct fixup relocation for mpc824x"
This reverts commit f3a52fe05923935db86985daf9438e2f70ac39aa. 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 eb4d8e4..57358b8 100644
--- a/board/mousse/u-boot.lds
+++ b/board/mousse/u-boot.lds
@@ -60,6 +60,7 @@ 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 17fdb21..66207f4 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 -mrelocatable
+PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi -fno-strict-aliasing
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 8cbef4a..c90d1e9 100644
--- a/cpu/mpc824x/u-boot.lds
+++ b/cpu/mpc824x/u-boot.lds
@@ -55,6 +55,7 @@ SECTIONS
{
cpu/mpc824x/start.o (.text)
*(.text)
+ *(.fixup)
*(.got1)
. = ALIGN(16);
*(.rodata)
diff --git a/include/common.h b/include/common.h
index d763cc7..8ba57e8 100644
--- a/include/common.h
+++ b/include/common.h
@@ -73,8 +73,6 @@ 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) \