summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-06-17 22:31:04 +0200
committerWolfgang Denk <wd@denx.de>2010-06-17 22:31:04 +0200
commit1f241263e088a71b8f33f87b03a37c5418d41e2e (patch)
tree8bd9dbdfa3a19f322810e2ad9e6d6551602d8afe /arch/arm
parentcecda170e7816d10edf0f5e64c420e9c618001ec (diff)
parent3a96ad851f4f9267e1199b700cb838a77334e4b2 (diff)
downloadu-boot-imx-1f241263e088a71b8f33f87b03a37c5418d41e2e.zip
u-boot-imx-1f241263e088a71b8f33f87b03a37c5418d41e2e.tar.gz
u-boot-imx-1f241263e088a71b8f33f87b03a37c5418d41e2e.tar.bz2
Merge branch 'fix' of git://git.denx.de/u-boot-pxa
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/cpu/pxa/start.S5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/cpu/pxa/start.S b/arch/arm/cpu/pxa/start.S
index 63ab0c5..3989fa6 100644
--- 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 */