summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2007-11-15 08:27:52 -0700
committerGrant Likely <grant.likely@secretlab.ca>2007-11-15 08:31:27 -0700
commit955413f35f054a82e40042f1dbcf501c6a05719b (patch)
treeae530eb65a95534b2e887b817016af45e876e164
parente15633888a058aacb31a62d2cf1278e1e4c236ab (diff)
downloadtalos-obmc-uboot-955413f35f054a82e40042f1dbcf501c6a05719b.tar.gz
talos-obmc-uboot-955413f35f054a82e40042f1dbcf501c6a05719b.zip
Revert "Correct relocation fixup for mpc5xx"
This reverts commit 3649cd99ba815b6601868735765602f00ef3692b. 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 e95b8a1a85..64cd60071a 100644
--- a/cpu/mpc5xx/config.mk
+++ b/cpu/mpc5xx/config.mk
@@ -28,7 +28,7 @@
#
-PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi -mrelocatable
+PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi
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 10001b1c1d..5b03fef66c 100644
--- a/cpu/mpc5xx/u-boot.lds
+++ b/cpu/mpc5xx/u-boot.lds
@@ -59,6 +59,7 @@ SECTIONS
cpu/mpc5xx/start.o (.text)
*(.text)
+ *(.fixup)
*(.got1)
}
_etext = .;
diff --git a/include/common.h b/include/common.h
index 4bfb8c5627..63ac8b062c 100644
--- a/include/common.h
+++ b/include/common.h
@@ -63,7 +63,6 @@ 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_MPC512X)
OpenPOWER on IntegriCloud