diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2007-11-15 08:21:04 -0700 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2007-11-15 08:31:21 -0700 |
| commit | 139365fbe566d0fc619a1ed04452ec5388f0cef8 (patch) | |
| tree | 12deae896a5cb75f06a19362c66221b2929e3ddc | |
| parent | 70922342369e5e39b286fe21e768a239ca07a514 (diff) | |
| download | u-boot-imx-139365fbe566d0fc619a1ed04452ec5388f0cef8.zip u-boot-imx-139365fbe566d0fc619a1ed04452ec5388f0cef8.tar.gz u-boot-imx-139365fbe566d0fc619a1ed04452ec5388f0cef8.tar.bz2 | |
Revert "Correct fixup relocation for mpc8220"
This reverts commit a85dd254c0577fca13627c46e93fc2ad4c4f1f00.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
| -rw-r--r-- | cpu/mpc8220/config.mk | 2 | ||||
| -rw-r--r-- | cpu/mpc8220/u-boot.lds | 1 | ||||
| -rw-r--r-- | include/common.h | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/cpu/mpc8220/config.mk b/cpu/mpc8220/config.mk index c41cafe..8e3ba54 100644 --- a/cpu/mpc8220/config.mk +++ b/cpu/mpc8220/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_MPC8220 -ffixed-r2 -ffixed-r29 \ -mstring -mcpu=603e -mmultiple diff --git a/cpu/mpc8220/u-boot.lds b/cpu/mpc8220/u-boot.lds index a199a64..889bc77 100644 --- a/cpu/mpc8220/u-boot.lds +++ b/cpu/mpc8220/u-boot.lds @@ -55,6 +55,7 @@ SECTIONS { cpu/mpc8220/start.o (.text) *(.text) + *(.fixup) *(.got1) . = ALIGN(16); *(.rodata) diff --git a/include/common.h b/include/common.h index 8ba57e8..a4d1f8d 100644 --- a/include/common.h +++ b/include/common.h @@ -72,7 +72,6 @@ typedef volatile unsigned char vu_char; #include <asm/immap_512x.h> #elif defined(CONFIG_MPC8220) #include <asm/immap_8220.h> -#define CONFIG_RELOC_FIXUP_WORKS #elif defined(CONFIG_8260) #if defined(CONFIG_MPC8247) \ || defined(CONFIG_MPC8248) \ |