diff options
author | Jon Loeliger <jdl@freescale.com> | 2007-11-20 14:34:57 -0600 |
---|---|---|
committer | Jon Loeliger <jdl@freescale.com> | 2007-11-20 14:34:57 -0600 |
commit | 890e9413c0af74a3d74f37d9ab6d19784990fa0c (patch) | |
tree | 0e802d5d143e09751f85c76bf02f94aca023d077 /cpu/mpc8220 | |
parent | 1d8a49eca1c7bdc8db1c47a92f9014a29ead03ae (diff) | |
parent | 9a337ddc154a10a26f117fd147b009abcdeba75a (diff) | |
download | u-boot-imx-890e9413c0af74a3d74f37d9ab6d19784990fa0c.zip u-boot-imx-890e9413c0af74a3d74f37d9ab6d19784990fa0c.tar.gz u-boot-imx-890e9413c0af74a3d74f37d9ab6d19784990fa0c.tar.bz2 |
Merge commit 'remotes/wd/master'
Diffstat (limited to 'cpu/mpc8220')
-rw-r--r-- | cpu/mpc8220/config.mk | 2 | ||||
-rw-r--r-- | cpu/mpc8220/u-boot.lds | 1 |
2 files changed, 2 insertions, 1 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) |