diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-06-17 22:31:04 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-06-17 22:31:04 +0200 |
| commit | 1f241263e088a71b8f33f87b03a37c5418d41e2e (patch) | |
| tree | 8bd9dbdfa3a19f322810e2ad9e6d6551602d8afe | |
| parent | cecda170e7816d10edf0f5e64c420e9c618001ec (diff) | |
| parent | 3a96ad851f4f9267e1199b700cb838a77334e4b2 (diff) | |
| download | blackbird-obmc-uboot-1f241263e088a71b8f33f87b03a37c5418d41e2e.tar.gz blackbird-obmc-uboot-1f241263e088a71b8f33f87b03a37c5418d41e2e.zip | |
Merge branch 'fix' of git://git.denx.de/u-boot-pxa
| -rw-r--r-- | arch/arm/cpu/pxa/start.S | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/cpu/pxa/start.S b/arch/arm/cpu/pxa/start.S index 63ab0c591a..3989fa61bc 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 */ |
