diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-06-18 01:20:49 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-06-18 01:20:49 +0200 |
| commit | 54e19a7ded6e9dbdc3392a57d82f4f77b34e85b8 (patch) | |
| tree | 9e796e38d4edeabec4d091ed89d6fe179e84956c /arch/arm/cpu/pxa/start.S | |
| parent | 86caca1cd97ba71b7a7c82f2b0163682df35ce5d (diff) | |
| parent | 1f241263e088a71b8f33f87b03a37c5418d41e2e (diff) | |
| download | u-boot-imx-54e19a7ded6e9dbdc3392a57d82f4f77b34e85b8.zip u-boot-imx-54e19a7ded6e9dbdc3392a57d82f4f77b34e85b8.tar.gz u-boot-imx-54e19a7ded6e9dbdc3392a57d82f4f77b34e85b8.tar.bz2 | |
Merge branch 'master' into next
Conflicts:
Makefile
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'arch/arm/cpu/pxa/start.S')
| -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 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 */ |