diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2007-11-15 08:27:52 -0700 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2007-11-15 08:31:27 -0700 |
| commit | 955413f35f054a82e40042f1dbcf501c6a05719b (patch) | |
| tree | ae530eb65a95534b2e887b817016af45e876e164 | |
| parent | e15633888a058aacb31a62d2cf1278e1e4c236ab (diff) | |
| download | u-boot-imx-955413f35f054a82e40042f1dbcf501c6a05719b.zip u-boot-imx-955413f35f054a82e40042f1dbcf501c6a05719b.tar.gz u-boot-imx-955413f35f054a82e40042f1dbcf501c6a05719b.tar.bz2 | |
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.mk | 2 | ||||
| -rw-r--r-- | cpu/mpc5xx/u-boot.lds | 1 | ||||
| -rw-r--r-- | include/common.h | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/cpu/mpc5xx/config.mk b/cpu/mpc5xx/config.mk index e95b8a1..64cd600 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 10001b1..5b03fef 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 4bfb8c5..63ac8b0 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) |