diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2015-11-25 17:56:32 +0100 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-01-13 21:05:17 -0500 |
| commit | ecc306639e83c9019a5093b77a48685ea40eedc2 (patch) | |
| tree | 7785c9d7358ccd22ddabe52489aae8a8c7035ffe /arch/arm/lib | |
| parent | 20d08f59fa7cdde0da1eb7aca7915c91dbdeaf51 (diff) | |
| download | talos-obmc-uboot-ecc306639e83c9019a5093b77a48685ea40eedc2.tar.gz talos-obmc-uboot-ecc306639e83c9019a5093b77a48685ea40eedc2.zip | |
Fix board init code to respect the C runtime environment
board_init_f_mem() alters the C runtime environment's
stack it is actually already using. This is not a valid
behaviour within a C runtime environment.
Split board_init_f_mem into C functions which do not alter
their own stack and always behave properly with respect to
their C runtime environment.
Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
Acked-by: Thomas Chou <thomas@wytron.com.tw>
Diffstat (limited to 'arch/arm/lib')
| -rw-r--r-- | arch/arm/lib/crt0.S | 3 | ||||
| -rw-r--r-- | arch/arm/lib/crt0_64.S | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/lib/crt0.S b/arch/arm/lib/crt0.S index 80548ebbf6..4f2a7121c4 100644 --- a/arch/arm/lib/crt0.S +++ b/arch/arm/lib/crt0.S @@ -83,8 +83,9 @@ ENTRY(_main) bic sp, sp, #7 /* 8-byte alignment for ABI compliance */ #endif mov r0, sp - bl board_init_f_mem + bl board_init_f_alloc_reserve mov sp, r0 + bl board_init_f_init_reserve mov r0, #0 bl board_init_f diff --git a/arch/arm/lib/crt0_64.S b/arch/arm/lib/crt0_64.S index cef1c7171c..b4fc760609 100644 --- a/arch/arm/lib/crt0_64.S +++ b/arch/arm/lib/crt0_64.S @@ -75,8 +75,10 @@ ENTRY(_main) ldr x0, =(CONFIG_SYS_INIT_SP_ADDR) #endif bic sp, x0, #0xf /* 16-byte alignment for ABI compliance */ - bl board_init_f_mem + mov x0, sp + bl board_init_f_alloc_reserve mov sp, x0 + bl board_init_f_init_reserve mov x0, #0 bl board_init_f |
