summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2007-11-15 08:20:25 -0700
committerGrant Likely <grant.likely@secretlab.ca>2007-11-15 08:31:16 -0700
commitc93945e8f9e300860d2bf73a2549ce5794f8bd00 (patch)
treee33e3498a3eda409fa338f08d8ff9ea9d91c754b
parent1ce55151c85d068f70317a8d65c61058b891afb4 (diff)
downloadu-boot-imx-c93945e8f9e300860d2bf73a2549ce5794f8bd00.zip
u-boot-imx-c93945e8f9e300860d2bf73a2549ce5794f8bd00.tar.gz
u-boot-imx-c93945e8f9e300860d2bf73a2549ce5794f8bd00.tar.bz2
Revert "[MPC512x] Correct fixup relocation"
This reverts commit 8d17979d0359492a822a0a409d26e3a3549b4cd4. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
-rw-r--r--board/ads5121/u-boot.lds1
-rw-r--r--cpu/mpc512x/config.mk2
-rw-r--r--include/common.h1
3 files changed, 2 insertions, 2 deletions
diff --git a/board/ads5121/u-boot.lds b/board/ads5121/u-boot.lds
index 34ceb0f..038d849 100644
--- a/board/ads5121/u-boot.lds
+++ b/board/ads5121/u-boot.lds
@@ -51,6 +51,7 @@ SECTIONS
{
cpu/mpc512x/start.o (.text)
*(.text)
+ *(.fixup)
*(.got1)
. = ALIGN(16);
*(.rodata)
diff --git a/cpu/mpc512x/config.mk b/cpu/mpc512x/config.mk
index 3259d53..8a07c5a 100644
--- a/cpu/mpc512x/config.mk
+++ b/cpu/mpc512x/config.mk
@@ -19,7 +19,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
# MA 02111-1307 USA
#
-PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi -mrelocatable
+PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi
PLATFORM_CPPFLAGS += -DCONFIG_MPC512X -DCONFIG_E300 \
-ffixed-r2 -ffixed-r29 -msoft-float -mcpu=603e
diff --git a/include/common.h b/include/common.h
index aca281b..5a63906 100644
--- a/include/common.h
+++ b/include/common.h
@@ -70,7 +70,6 @@ typedef volatile unsigned char vu_char;
#elif defined(CONFIG_MPC512X)
#include <mpc512x.h>
#include <asm/immap_512x.h>
-#define CONFIG_RELOC_FIXUP_WORKS
#elif defined(CONFIG_MPC8220)
#include <asm/immap_8220.h>
#define CONFIG_RELOC_FIXUP_WORKS