From 1c706dc85830a1d91c7ff7c99ac48efd8d085613 Mon Sep 17 00:00:00 2001 From: "Ronald G. Minnich" Date: Thu, 17 Jan 2013 11:14:17 -0800 Subject: Fix the stack setup code so we can use an arbitrary 32-bit value We've had obscure errors as the size of the bootblock changes. This fix allows us to use a 32-bit constant. Please test on real hardware before you ack. Change-Id: Ic3d9f4763554bd6104ae9c4ce5bbacd17b40872c Signed-off-by: Ronald G. Minnich Reviewed-on: http://review.coreboot.org/2168 Reviewed-by: David Hendricks Tested-by: build bot (Jenkins) --- src/arch/armv7/bootblock.inc | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'src/arch') diff --git a/src/arch/armv7/bootblock.inc b/src/arch/armv7/bootblock.inc index e1b8b19341..4fe7502681 100644 --- a/src/arch/armv7/bootblock.inc +++ b/src/arch/armv7/bootblock.inc @@ -71,7 +71,7 @@ reset: /* Set stackpointer in internal RAM to call board_init_f */ call_bootblock: - ldr sp, =(CONFIG_SYS_INIT_SP_ADDR) /* Set up stack pointer */ + ldr sp, .Stack /* Set up stack pointer */ bic sp, sp, #7 /* 8-byte alignment for ABI compliance */ ldr r0,=0x00000000 /* @@ -85,3 +85,11 @@ call_bootblock: wait_for_interrupt: wfi mov pc, lr @ back to my caller + +/* we do it this way because it's a 32-bit constant and + * in some cases too far away to be loaded as just an offset + * from IP + */ +.align 2 +.Stack: + .word CONFIG_SYS_INIT_SP_ADDR -- cgit v1.2.3