Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2025-02-17 22:49:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

bootstage: Use BOOTSTAGE instead of BOOTSTATE

Browse source 
Some of the enum members are wrong. Fix them.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2020-05-10 11:39:59 -06:00 • committed by Tom Rini
parent e6f6f9e648
commit b67eefdb6e
6 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/x86/lib/fsp2/fsp_meminit.c
View file

@ -79,10 +79,10 @@ int fsp_memory_init(bool s3wake, bool use_spi_flash)
return log_msg_ret("Could not setup config", ret); return log_msg_ret("Could not setup config", ret);
debug("SDRAM init..."); debug("SDRAM init...");
bootstage_start(BOOTSTATE_ID_ACCUM_FSP_M, "fsp-m"); bootstage_start(BOOTSTAGE_ID_ACCUM_FSP_M, "fsp-m");
func = (fsp_memory_init_func)(hdr->img_base + hdr->fsp_mem_init); func = (fsp_memory_init_func)(hdr->img_base + hdr->fsp_mem_init);
ret = func(&upd, &hob); ret = func(&upd, &hob);
bootstage_accum(BOOTSTATE_ID_ACCUM_FSP_M); bootstage_accum(BOOTSTAGE_ID_ACCUM_FSP_M);
if (ret) if (ret)
return log_msg_ret("SDRAM init fail\n", ret); return log_msg_ret("SDRAM init fail\n", ret);

4
arch/x86/lib/fsp2/fsp_silicon_init.c
View file

@ -42,10 +42,10 @@ int fsp_silicon_init(bool s3wake, bool use_spi_flash)
if (ret) if (ret)
return log_msg_ret("Could not setup config", ret); return log_msg_ret("Could not setup config", ret);
log_debug("Silicon init..."); log_debug("Silicon init...");
bootstage_start(BOOTSTATE_ID_ACCUM_FSP_S, "fsp-s"); bootstage_start(BOOTSTAGE_ID_ACCUM_FSP_S, "fsp-s");
func = (fsp_silicon_init_func)(hdr->img_base + hdr->fsp_silicon_init); func = (fsp_silicon_init_func)(hdr->img_base + hdr->fsp_silicon_init);
ret = func(&upd); ret = func(&upd);
bootstage_accum(BOOTSTATE_ID_ACCUM_FSP_S); bootstage_accum(BOOTSTAGE_ID_ACCUM_FSP_S);
if (ret) if (ret)
return log_msg_ret("Silicon init fail\n", ret); return log_msg_ret("Silicon init fail\n", ret);
log_debug("done\n"); log_debug("done\n");

4
common/board_f.c
View file

@ -823,9 +823,9 @@ static int initf_dm(void)
#if defined(CONFIG_DM) && CONFIG_VAL(SYS_MALLOC_F_LEN) #if defined(CONFIG_DM) && CONFIG_VAL(SYS_MALLOC_F_LEN)
int ret; int ret;
bootstage_start(BOOTSTATE_ID_ACCUM_DM_F, "dm_f"); bootstage_start(BOOTSTAGE_ID_ACCUM_DM_F, "dm_f");
ret = dm_init_and_scan(true); ret = dm_init_and_scan(true);
bootstage_accum(BOOTSTATE_ID_ACCUM_DM_F); bootstage_accum(BOOTSTAGE_ID_ACCUM_DM_F);
if (ret) if (ret)
return ret; return ret;
#endif #endif

4
common/board_r.c
View file

@ -312,9 +312,9 @@ static int initr_dm(void)
#ifdef CONFIG_TIMER #ifdef CONFIG_TIMER
gd->timer = NULL; gd->timer = NULL;
#endif #endif
bootstage_start(BOOTSTATE_ID_ACCUM_DM_R, "dm_r"); bootstage_start(BOOTSTAGE_ID_ACCUM_DM_R, "dm_r");
ret = dm_init_and_scan(false); ret = dm_init_and_scan(false);
bootstage_accum(BOOTSTATE_ID_ACCUM_DM_R); bootstage_accum(BOOTSTAGE_ID_ACCUM_DM_R);
if (ret) if (ret)
return ret; return ret;

4
common/spl/spl.c
View file

@ -423,11 +423,11 @@ static int spl_common_init(bool setup_malloc)
} }
} }
if (CONFIG_IS_ENABLED(DM)) { if (CONFIG_IS_ENABLED(DM)) {
bootstage_start(BOOTSTATE_ID_ACCUM_DM_SPL, bootstage_start(BOOTSTAGE_ID_ACCUM_DM_SPL,
spl_phase() == PHASE_TPL ? "dm tpl" : "dm_spl"); spl_phase() == PHASE_TPL ? "dm tpl" : "dm_spl");
/* With CONFIG_SPL_OF_PLATDATA, bring in all devices */ /* With CONFIG_SPL_OF_PLATDATA, bring in all devices */
ret = dm_init_and_scan(!CONFIG_IS_ENABLED(OF_PLATDATA)); ret = dm_init_and_scan(!CONFIG_IS_ENABLED(OF_PLATDATA));
bootstage_accum(BOOTSTATE_ID_ACCUM_DM_SPL); bootstage_accum(BOOTSTAGE_ID_ACCUM_DM_SPL);
if (ret) { if (ret) {
debug("dm_init_and_scan() returned error %d\n", ret); debug("dm_init_and_scan() returned error %d\n", ret);
return ret; return ret;

10
include/bootstage.h
View file

@ -199,11 +199,11 @@ enum bootstage_id {
BOOTSTAGE_ID_ACCUM_DECOMP, BOOTSTAGE_ID_ACCUM_DECOMP,
BOOTSTAGE_ID_ACCUM_OF_LIVE, BOOTSTAGE_ID_ACCUM_OF_LIVE,
BOOTSTAGE_ID_FPGA_INIT, BOOTSTAGE_ID_FPGA_INIT,
BOOTSTATE_ID_ACCUM_DM_SPL, BOOTSTAGE_ID_ACCUM_DM_SPL,
BOOTSTATE_ID_ACCUM_DM_F, BOOTSTAGE_ID_ACCUM_DM_F,
BOOTSTATE_ID_ACCUM_DM_R, BOOTSTAGE_ID_ACCUM_DM_R,
BOOTSTATE_ID_ACCUM_FSP_M, BOOTSTAGE_ID_ACCUM_FSP_M,
BOOTSTATE_ID_ACCUM_FSP_S, BOOTSTAGE_ID_ACCUM_FSP_S,
BOOTSTAGE_ID_ACCUM_MMAP_SPI, BOOTSTAGE_ID_ACCUM_MMAP_SPI,
/* a few spare for the user, from here */ /* a few spare for the user, from here */