diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2007-11-13 22:18:33 -0700 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2007-11-17 01:38:58 +0100 |
commit | 1c3dd43338a077165e7e0309cb3994e65d2bdbf8 (patch) | |
tree | 693c95dd175c7d32bfc147f47eeaae22445e896e /cpu/mpc5xxx | |
parent | 5c15010efad980ad5498cc565fc1ed70df2f52b4 (diff) | |
download | u-boot-imx-1c3dd43338a077165e7e0309cb3994e65d2bdbf8.zip u-boot-imx-1c3dd43338a077165e7e0309cb3994e65d2bdbf8.tar.gz u-boot-imx-1c3dd43338a077165e7e0309cb3994e65d2bdbf8.tar.bz2 |
powerpc: Backout relocation changes.
Ugh. I *hate* to back this change out, but these compiler flags don't
work for relocation on all versions of GCC. I've not been able to
reproduce the environment in my setup (and hence, not been able to
find a combination that *does* work), so I've got no choice but to go
back to the old gcc flags and linker script.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'cpu/mpc5xxx')
-rw-r--r-- | cpu/mpc5xxx/config.mk | 2 | ||||
-rw-r--r-- | cpu/mpc5xxx/u-boot-customlayout.lds | 1 | ||||
-rw-r--r-- | cpu/mpc5xxx/u-boot.lds | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/cpu/mpc5xxx/config.mk b/cpu/mpc5xxx/config.mk index 0e861c4..0df51ba 100644 --- a/cpu/mpc5xxx/config.mk +++ b/cpu/mpc5xxx/config.mk @@ -21,7 +21,7 @@ # MA 02111-1307 USA # -PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi -mrelocatable +PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi PLATFORM_CPPFLAGS += -DCONFIG_MPC5xxx -ffixed-r2 -ffixed-r29 \ -mstring -mcpu=603e -mmultiple diff --git a/cpu/mpc5xxx/u-boot-customlayout.lds b/cpu/mpc5xxx/u-boot-customlayout.lds index 1107943..123a14c 100644 --- a/cpu/mpc5xxx/u-boot-customlayout.lds +++ b/cpu/mpc5xxx/u-boot-customlayout.lds @@ -66,6 +66,7 @@ SECTIONS common/environment.o (.ppcenv) *(.text) + *(.fixup) *(.got1) . = ALIGN(16); *(.rodata) diff --git a/cpu/mpc5xxx/u-boot.lds b/cpu/mpc5xxx/u-boot.lds index a28a3af..78818a4 100644 --- a/cpu/mpc5xxx/u-boot.lds +++ b/cpu/mpc5xxx/u-boot.lds @@ -55,6 +55,7 @@ SECTIONS { cpu/mpc5xxx/start.o (.text) *(.text) + *(.fixup) *(.got1) . = ALIGN(16); *(.rodata) |