diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2007-11-15 08:24:32 -0700 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2007-11-15 08:31:22 -0700 |
| commit | e15633888a058aacb31a62d2cf1278e1e4c236ab (patch) | |
| tree | 8ac3226d03fbfb75fd025b00db7efe528d72b788 | |
| parent | 139365fbe566d0fc619a1ed04452ec5388f0cef8 (diff) | |
| download | talos-obmc-uboot-e15633888a058aacb31a62d2cf1278e1e4c236ab.tar.gz talos-obmc-uboot-e15633888a058aacb31a62d2cf1278e1e4c236ab.zip | |
Revert "Correct fixup relocation for MPC5xxx"
This reverts commit 6f7576b20ecf0d040c3ac3b032b5cbc860e38a90.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
| -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 | ||||
| -rw-r--r-- | include/common.h | 1 |
4 files changed, 3 insertions, 2 deletions
diff --git a/cpu/mpc5xxx/config.mk b/cpu/mpc5xxx/config.mk index 0e861c4a0f..0df51babd7 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 11079430d5..123a14c5aa 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 a28a3afc71..78818a49eb 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) diff --git a/include/common.h b/include/common.h index a4d1f8d962..4bfb8c5627 100644 --- a/include/common.h +++ b/include/common.h @@ -66,7 +66,6 @@ typedef volatile unsigned char vu_char; #define CONFIG_RELOC_FIXUP_WORKS #elif defined(CONFIG_MPC5xxx) #include <mpc5xxx.h> -#define CONFIG_RELOC_FIXUP_WORKS #elif defined(CONFIG_MPC512X) #include <mpc512x.h> #include <asm/immap_512x.h> |
