diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2007-07-03 00:34:44 -0600 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-07-04 01:08:27 +0200 |
| commit | 5af61b2f4b838a05f79be274f3e5a66edd2d9c96 (patch) | |
| tree | ad20947caccfdc40554e5aa3b87799217e755a21 | |
| parent | f3a52fe05923935db86985daf9438e2f70ac39aa (diff) | |
Correct fixup relocation for mpc8260
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
| -rw-r--r-- | board/cogent/u-boot.lds | 1 | ||||
| -rw-r--r-- | board/hymod/u-boot.lds | 1 | ||||
| -rw-r--r-- | board/rsdproto/u-boot.lds | 1 | ||||
| -rw-r--r-- | cpu/mpc8260/config.mk | 2 | ||||
| -rw-r--r-- | cpu/mpc8260/u-boot.lds | 1 | ||||
| -rw-r--r-- | include/common.h | 1 |
6 files changed, 2 insertions, 5 deletions
diff --git a/board/cogent/u-boot.lds b/board/cogent/u-boot.lds index 5ce2694cb..d87a39b24 100644 --- a/board/cogent/u-boot.lds +++ b/board/cogent/u-boot.lds @@ -55,7 +55,6 @@ SECTIONS { *(.text) common/environment.o(.text) - *(.fixup) *(.got1) } _etext = .; diff --git a/board/hymod/u-boot.lds b/board/hymod/u-boot.lds index 337a3954d..9bf0f0938 100644 --- a/board/hymod/u-boot.lds +++ b/board/hymod/u-boot.lds @@ -69,7 +69,6 @@ SECTIONS common/environment.o(.text) *(.text) - *(.fixup) *(.got1) } _etext = .; diff --git a/board/rsdproto/u-boot.lds b/board/rsdproto/u-boot.lds index 70fc3a5d2..9bd624809 100644 --- a/board/rsdproto/u-boot.lds +++ b/board/rsdproto/u-boot.lds @@ -55,7 +55,6 @@ SECTIONS { cpu/mpc8260/start.o (.text) *(.text) - *(.fixup) *(.got1) /*. = env_offset; */ } diff --git a/cpu/mpc8260/config.mk b/cpu/mpc8260/config.mk index 683b6fbf2..d401e4ca0 100644 --- a/cpu/mpc8260/config.mk +++ b/cpu/mpc8260/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_8260 -DCONFIG_CPM2 -ffixed-r2 -ffixed-r29 \ -mstring -mcpu=603e -mmultiple diff --git a/cpu/mpc8260/u-boot.lds b/cpu/mpc8260/u-boot.lds index 3e84f234d..b8abc17d4 100644 --- a/cpu/mpc8260/u-boot.lds +++ b/cpu/mpc8260/u-boot.lds @@ -55,7 +55,6 @@ SECTIONS { cpu/mpc8260/start.o (.text) *(.text) - *(.fixup) *(.got1) . = ALIGN(16); *(.rodata) diff --git a/include/common.h b/include/common.h index 4c50053c0..b224e0697 100644 --- a/include/common.h +++ b/include/common.h @@ -83,6 +83,7 @@ typedef volatile unsigned char vu_char; #define CONFIG_MPC8260 1 #endif #include <asm/immap_8260.h> +#define CONFIG_RELOC_FIXUP_WORKS #endif #ifdef CONFIG_MPC86xx #include <mpc86xx.h> |