diff options
author | Minkyu Kang <mk7.kang@samsung.com> | 2009-10-30 12:14:40 +0900 |
---|---|---|
committer | Minkyu Kang <mk7.kang@samsung.com> | 2009-10-30 12:14:40 +0900 |
commit | 0bf7de838096e804f0cece8f2d94905477381b6e (patch) | |
tree | fc57495ade62aeba85b935353955a28444e5b65b /cpu/arm926ejs/start.S | |
parent | d43bc3d2d09022bcffa1302b8f51e7fabe2dc68a (diff) | |
parent | 4bc3d2afb380e78fdbb9c501d9a8da6d59eb178e (diff) | |
download | u-boot-imx-0bf7de838096e804f0cece8f2d94905477381b6e.zip u-boot-imx-0bf7de838096e804f0cece8f2d94905477381b6e.tar.gz u-boot-imx-0bf7de838096e804f0cece8f2d94905477381b6e.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts:
board/eukrea/cpu9260/cpu9260.c
drivers/serial/serial_s5pc1xx.c
include/asm-arm/arch-s5pc1xx/clock.h
include/asm-arm/arch-s5pc1xx/gpio.h
include/asm-arm/arch-s5pc1xx/pwm.h
include/asm-arm/arch-s5pc1xx/uart.h
include/configs/cpu9260.h
include/configs/cpuat91.h
include/configs/davinci_dm355evm.h
include/linux/mtd/samsung_onenand.h
Diffstat (limited to 'cpu/arm926ejs/start.S')
-rw-r--r-- | cpu/arm926ejs/start.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cpu/arm926ejs/start.S b/cpu/arm926ejs/start.S index 8043322..4421b6a 100644 --- a/cpu/arm926ejs/start.S +++ b/cpu/arm926ejs/start.S @@ -172,6 +172,7 @@ stack_setup: sub r0, r0, #(CONFIG_STACKSIZE_IRQ+CONFIG_STACKSIZE_FIQ) #endif sub sp, r0, #12 /* leave 3 words for abort-stack */ + bic sp, r0, #7 /* 8-byte align stack for ABI compliance */ clear_bss: ldr r0, _bss_start /* find start of bss segment */ |