aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrant Likely2007-07-03 00:34:24 -0600
committerWolfgang Denk2007-07-04 01:07:28 +0200
commit3649cd99ba815b6601868735765602f00ef3692b (patch)
tree62af179277d2d7072f881754ac375dc4986fde0d
parentf82b3b6304b620ef7e28bfaa1ea887a2ad2fa325 (diff)
Correct relocation fixup for mpc5xx
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
-rw-r--r--cpu/mpc5xx/config.mk2
-rw-r--r--cpu/mpc5xx/u-boot.lds1
-rw-r--r--include/common.h1
3 files changed, 2 insertions, 2 deletions
diff --git a/cpu/mpc5xx/config.mk b/cpu/mpc5xx/config.mk
index 64cd60071ad..e95b8a1a855 100644
--- a/cpu/mpc5xx/config.mk
+++ b/cpu/mpc5xx/config.mk
@@ -28,7 +28,7 @@
#
-PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi
+PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi -mrelocatable
PLATFORM_CPPFLAGS += -DCONFIG_5xx -ffixed-r2 -ffixed-r29 -mpowerpc -msoft-float
diff --git a/cpu/mpc5xx/u-boot.lds b/cpu/mpc5xx/u-boot.lds
index 5b03fef66c7..10001b1c1de 100644
--- a/cpu/mpc5xx/u-boot.lds
+++ b/cpu/mpc5xx/u-boot.lds
@@ -59,7 +59,6 @@ SECTIONS
cpu/mpc5xx/start.o (.text)
*(.text)
- *(.fixup)
*(.got1)
}
_etext = .;
diff --git a/include/common.h b/include/common.h
index d8b6b469e5f..7319c549392 100644
--- a/include/common.h
+++ b/include/common.h
@@ -63,6 +63,7 @@ typedef volatile unsigned char vu_char;
#endif
#elif defined(CONFIG_5xx)
#include <asm/5xx_immap.h>
+#define CONFIG_RELOC_FIXUP_WORKS
#elif defined(CONFIG_MPC5xxx)
#include <mpc5xxx.h>
#elif defined(CONFIG_MPC8220)