diff options
| author | Tom Rini <trini@konsulko.com> | 2019-01-24 15:29:45 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-01-24 15:29:45 -0500 |
| commit | 0c3b301f79fcad081c8509ee4cb06e7b0478c8c1 (patch) | |
| tree | bd1753679d1dd2c7861aebd833c6ba5be2376391 /arch/powerpc/cpu/mpc85xx | |
| parent | ce0d1e48165fdd3bde4bb431f1d2e100b1617a6e (diff) | |
| parent | 45e81f9ab3e97aec8e8744b23589bc21086cfd43 (diff) | |
Merge tag 'mpc85xx-for-v2019.04-rc1' of git://git.denx.de/u-boot-mpc85xx
mpc85xx config.mk: Add support for -msingle-pic-base
Diffstat (limited to 'arch/powerpc/cpu/mpc85xx')
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/config.mk | 1 | ||||
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/start.S | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/config.mk b/arch/powerpc/cpu/mpc85xx/config.mk index 44d69add68..7a1d81cf2d 100644 --- a/arch/powerpc/cpu/mpc85xx/config.mk +++ b/arch/powerpc/cpu/mpc85xx/config.mk @@ -4,6 +4,7 @@ # Xianghua Xiao, X.Xiao@motorola.com PLATFORM_CPPFLAGS += -Wa,-me500 -msoft-float -mno-string +PLATFORM_RELFLAGS += -msingle-pic-base -fno-jump-tables # -mspe=yes is needed to have -mno-spe accepted by a buggy GCC; # see "[PATCH,rs6000] make -mno-spe work as expected" on diff --git a/arch/powerpc/cpu/mpc85xx/start.S b/arch/powerpc/cpu/mpc85xx/start.S index 932aa08b27..dbc705388c 100644 --- a/arch/powerpc/cpu/mpc85xx/start.S +++ b/arch/powerpc/cpu/mpc85xx/start.S @@ -1216,6 +1216,9 @@ _start_cont: mr r1,r3 /* Transfer to SP(r1) */ GET_GOT + /* Needed for -msingle-pic-base */ + bl _GLOBAL_OFFSET_TABLE_@local-4 + mflr r30 /* Pass our potential ePAPR device tree pointer to cpu_init_early_f */ mr r3, r24 |