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/powerpc/cpu | |
| 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/powerpc/cpu')
| -rw-r--r-- | arch/powerpc/cpu/ppc4xx/start.S | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/powerpc/cpu/ppc4xx/start.S b/arch/powerpc/cpu/ppc4xx/start.S index 3dd0557aa6..137afce37a 100644 --- a/arch/powerpc/cpu/ppc4xx/start.S +++ b/arch/powerpc/cpu/ppc4xx/start.S @@ -762,8 +762,9 @@ _start: bl cpu_init_f /* run low-level CPU init code (from Flash) */ #ifdef CONFIG_SYS_GENERIC_BOARD mr r3, r1 - bl board_init_f_mem + bl board_init_f_alloc_reserve mr r1, r3 + bl board_init_f_init_reserve li r0,0 stwu r0, -4(r1) stwu r0, -4(r1) @@ -1038,8 +1039,9 @@ _start: bl cpu_init_f /* run low-level CPU init code (from Flash) */ #ifdef CONFIG_SYS_GENERIC_BOARD mr r3, r1 - bl board_init_f_mem + bl board_init_f_alloc_reserve mr r1, r3 + bl board_init_f_init_reserve stwu r0, -4(r1) stwu r0, -4(r1) #endif |
