Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit ca4b55800ed74207c35271bf7335a092d4955416

Authored by Heiko Schocher
Committed by Albert ARIBAUD
1 parent ff62fb4c6a
Exists in master and in 54 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, u-boot-2013.01.y, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

arm, arm926ejs: always do cpu critical inits 

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>

Showing 1 changed file with 2 additions and 4 deletions Side-by-side Diff

arch/arm/cpu/arm926ejs/start.S
Diff comments   View file @ ca4b558
... ... @@ -194,9 +194,7 @@
194 194 * we do sys-critical inits only at reboot,
195 195 * not when booting from ram!
196 196 */
197   -#ifndef CONFIG_SKIP_LOWLEVEL_INIT
198 197 bl cpu_init_crit
199   -#endif
200 198  
201 199 /* Set stackpointer in internal RAM to call board_init_f */
202 200 call_board_init_f:
... ... @@ -355,7 +353,6 @@
355 353 *
356 354 *************************************************************************
357 355 */
358   -#ifndef CONFIG_SKIP_LOWLEVEL_INIT
359 356 cpu_init_crit:
360 357 /*
361 358 * flush v4 I/D caches
362 359  
363 360  
... ... @@ -374,14 +371,15 @@
374 371 orr r0, r0, #0x00001000 /* set bit 12 (I) I-Cache */
375 372 mcr p15, 0, r0, c1, c0, 0
376 373  
  374 +#ifndef CONFIG_SKIP_LOWLEVEL_INIT
377 375 /*
378 376 * Go setup Memory and board specific bits prior to relocation.
379 377 */
380 378 mov ip, lr /* perserve link reg across call */
381 379 bl lowlevel_init /* go setup pll,mux,memory */
382 380 mov lr, ip /* restore link */
383   - mov pc, lr /* back to my caller */
384 381 #endif /* CONFIG_SKIP_LOWLEVEL_INIT */
  382 + mov pc, lr /* back to my caller */
385 383  
386 384 #ifndef CONFIG_SPL_BUILD
387 385 /*