commit 6d7a9b9f252105d3bd85ef92eb8eb469185b973c
author Tom Rini <trini@konsulko.com> Mon Jan 21 11:59:00 2019 -0500
committer Tom Rini <trini@konsulko.com> Mon Jan 21 11:59:00 2019 -0500
tree 5932ba69ca7929d3d8df8f9e592d2ae32f2d7496
parent f92421cdb9de0eaae0a12f268a63c142f26ada75
parent f14554db5942df3077b02acbdf03322019783513

Merge git://git.denx.de/u-boot-mpc83xx

arch/powerpc/cpu/mpc83xx/config.mk

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

arch/powerpc/cpu/mpc83xx/start.S

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 @@
 	/*------------------------------------------------------*/
 
 	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