Merge branch 'fix' of git://git.denx.de/u-boot-pxa

15 years ago · 1f241263e0
parent cecda170e7 3a96ad851f
commit 1f241263e0
1 changed files with 4 additions and 1 deletions
--- a/arch/arm/cpu/pxa/start.S
+++ b/arch/arm/cpu/pxa/start.S
@ -140,7 +140,10 @@ stack_setup:
 #ifdef CONFIG_USE_IRQ
 	sub	r0, r0, #(CONFIG_STACKSIZE_IRQ+CONFIG_STACKSIZE_FIQ)
 #endif /* CONFIG_USE_IRQ */
-	sub	sp, r0, #12		/* leave 3 words for abort-stack    */
+	sub	r0, r0, #12		/* leave 3 words for abort-stack    */
+	bic	sp, r0, #7		/* NOTE: stack MUST be aligned to   */
+					/* 8 bytes in case we want to use   */
+					/* 64bit datatypes (eg. VSPRINTF64) */

 clear_bss:
 	ldr	r0, _bss_start		/* find start of bss segment	    */