GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-31 11:31:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

arm, arm926ejs: always do cpu critical inits

Browse source 
always do the cpu critical inits in cpu_init_crit,
and only jump to lowlevel_init, if CONFIG_SKIP_LOWLEVEL_INIT
is not defined.

Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Cc: Wolfgang Denk <hs@denx.de>
Cc: Sandeep Paulraj <s-paulraj@ti.com>
Cc: Tom Rini <tom.rini@gmail.com>
Cc: Christian Riesch <christian.riesch@omicron.at>
This commit is contained in:
Heiko Schocher 2011-11-09 20:06:23 +00:00 • committed by Albert ARIBAUD
parent ff62fb4c6a
commit ca4b55800e
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/arm/cpu/arm926ejs/start.S
View file

@ -194,9 +194,7 @@ reset:
* we do sys-critical inits only at reboot, * we do sys-critical inits only at reboot,
* not when booting from ram! * not when booting from ram!
*/ */
#ifndef CONFIG_SKIP_LOWLEVEL_INIT
bl cpu_init_crit bl cpu_init_crit
#endif
/* Set stackpointer in internal RAM to call board_init_f */ /* Set stackpointer in internal RAM to call board_init_f */
call_board_init_f: call_board_init_f:
@ -355,7 +353,6 @@ _dynsym_start_ofs:
* *
************************************************************************* *************************************************************************
*/ */
#ifndef CONFIG_SKIP_LOWLEVEL_INIT
cpu_init_crit: cpu_init_crit:
/* /*
* flush v4 I/D caches * flush v4 I/D caches
@ -374,14 +371,15 @@ cpu_init_crit:
orr r0, r0, #0x00001000 /* set bit 12 (I) I-Cache */ orr r0, r0, #0x00001000 /* set bit 12 (I) I-Cache */
mcr p15, 0, r0, c1, c0, 0 mcr p15, 0, r0, c1, c0, 0
#ifndef CONFIG_SKIP_LOWLEVEL_INIT
/* /*
* Go setup Memory and board specific bits prior to relocation. * Go setup Memory and board specific bits prior to relocation.
*/ */
mov ip, lr /* perserve link reg across call */ mov ip, lr /* perserve link reg across call */
bl lowlevel_init /* go setup pll,mux,memory */ bl lowlevel_init /* go setup pll,mux,memory */
mov lr, ip /* restore link */ mov lr, ip /* restore link */
mov pc, lr /* back to my caller */
#endif /* CONFIG_SKIP_LOWLEVEL_INIT */ #endif /* CONFIG_SKIP_LOWLEVEL_INIT */
mov pc, lr /* back to my caller */
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_SPL_BUILD
/* /*