diff options
author | Wolfgang Denk <wd@denx.de> | 2010-06-23 21:17:29 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2010-06-23 21:17:29 +0200 |
commit | f35f3968c21bc8d01958ad1f92fe30e6ccc9c318 (patch) | |
tree | 2d10d82ec489f225d58b185cf463a4f62ad45ed3 /arch/arm/cpu/arm_cortexa8/start.S | |
parent | 54e19a7ded6e9dbdc3392a57d82f4f77b34e85b8 (diff) | |
parent | 482126e27b3dbf0e69a6445da8b94b3551adf05d (diff) | |
download | u-boot-imx-f35f3968c21bc8d01958ad1f92fe30e6ccc9c318.zip u-boot-imx-f35f3968c21bc8d01958ad1f92fe30e6ccc9c318.tar.gz u-boot-imx-f35f3968c21bc8d01958ad1f92fe30e6ccc9c318.tar.bz2 |
Merge branch 'master' into next
Diffstat (limited to 'arch/arm/cpu/arm_cortexa8/start.S')
-rw-r--r-- | arch/arm/cpu/arm_cortexa8/start.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/cpu/arm_cortexa8/start.S b/arch/arm/cpu/arm_cortexa8/start.S index 29dae2f..1e0a150 100644 --- a/arch/arm/cpu/arm_cortexa8/start.S +++ b/arch/arm/cpu/arm_cortexa8/start.S @@ -164,7 +164,7 @@ stack_setup: sub r0, r0, #(CONFIG_STACKSIZE_IRQ + CONFIG_STACKSIZE_FIQ) #endif sub sp, r0, #12 @ leave 3 words for abort-stack - and sp, sp, #~7 @ 8 byte alinged for (ldr/str)d + bic sp, sp, #7 @ 8-byte alignment for ABI compliance /* Clear BSS (if any). Is below tx (watch load addr - need space) */ clear_bss: |