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

2019-01-21 11:59:00 -05:00 · 2019-01-21 11:59:00 -05:00 · 27fb313dd6
commit 27fb313dd6
parent 82eeb71ae9 64d68dcdd7
2 changed files with 4 additions and 0 deletions
--- 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
--- 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