diff options
| author | Tom Rini <trini@konsulko.com> | 2019-01-21 11:59:00 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-01-21 11:59:00 -0500 |
| commit | 27fb313dd639efc72beb08124fe4aa37bfd2c299 (patch) | |
| tree | 5932ba69ca7929d3d8df8f9e592d2ae32f2d7496 | |
| parent | 82eeb71ae9ddcdcd5326b397cbe0c42b71553f67 (diff) | |
| parent | 64d68dcdd7de3f8a20753a73a988835fafc3ce7c (diff) | |
| download | u-boot-27fb313dd639efc72beb08124fe4aa37bfd2c299.zip u-boot-27fb313dd639efc72beb08124fe4aa37bfd2c299.tar.gz u-boot-27fb313dd639efc72beb08124fe4aa37bfd2c299.tar.bz2 | |
Merge git://git.denx.de/u-boot-mpc83xx
| -rw-r--r-- | arch/powerpc/cpu/mpc83xx/config.mk | 1 | ||||
| -rw-r--r-- | arch/powerpc/cpu/mpc83xx/start.S | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/cpu/mpc83xx/config.mk b/arch/powerpc/cpu/mpc83xx/config.mk index 14870ee..a07df4d 100644 --- a/arch/powerpc/cpu/mpc83xx/config.mk +++ b/arch/powerpc/cpu/mpc83xx/config.mk @@ -3,3 +3,4 @@ # Copyright 2004 Freescale Semiconductor, Inc. PLATFORM_CPPFLAGS += -DCONFIG_E300 -msoft-float +PLATFORM_RELFLAGS += -msingle-pic-base -fno-jump-tables diff --git a/arch/powerpc/cpu/mpc83xx/start.S b/arch/powerpc/cpu/mpc83xx/start.S index a3bacf1..c00bb31 100644 --- a/arch/powerpc/cpu/mpc83xx/start.S +++ b/arch/powerpc/cpu/mpc83xx/start.S @@ -288,6 +288,9 @@ in_flash: /*------------------------------------------------------*/ GET_GOT /* initialize GOT access */ + /* Needed for -msingle-pic-base */ + bl _GLOBAL_OFFSET_TABLE_@local-4 + mflr r30 /* r3: IMMR */ lis r3, CONFIG_SYS_IMMR@h |