diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2007-07-03 00:34:29 -0600 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-07-04 01:07:40 +0200 |
| commit | 6f7576b20ecf0d040c3ac3b032b5cbc860e38a90 (patch) | |
| tree | 18d2ee2d277dbe8e1dba39d1a15e955830e9153b | |
| parent | 3649cd99ba815b6601868735765602f00ef3692b (diff) | |
| download | talos-obmc-uboot-6f7576b20ecf0d040c3ac3b032b5cbc860e38a90.tar.gz talos-obmc-uboot-6f7576b20ecf0d040c3ac3b032b5cbc860e38a90.zip | |
Correct fixup relocation for MPC5xxx
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, 2 insertions, 3 deletions
diff --git a/cpu/mpc5xxx/config.mk b/cpu/mpc5xxx/config.mk index 0df51babd7..0e861c4a0f 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 +PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi -mrelocatable 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 123a14c5aa..11079430d5 100644 --- a/cpu/mpc5xxx/u-boot-customlayout.lds +++ b/cpu/mpc5xxx/u-boot-customlayout.lds @@ -66,7 +66,6 @@ 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 78818a49eb..a28a3afc71 100644 --- a/cpu/mpc5xxx/u-boot.lds +++ b/cpu/mpc5xxx/u-boot.lds @@ -55,7 +55,6 @@ SECTIONS { cpu/mpc5xxx/start.o (.text) *(.text) - *(.fixup) *(.got1) . = ALIGN(16); *(.rodata) diff --git a/include/common.h b/include/common.h index 7319c54939..a905072ae3 100644 --- a/include/common.h +++ b/include/common.h @@ -66,6 +66,7 @@ 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_MPC8220) #include <asm/immap_8220.h> #elif defined(CONFIG_8260) |
