From b67eefdb6ec9467c41b1c0081f0823bbfff36b00 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 10 May 2020 11:39:59 -0600 Subject: bootstage: Use BOOTSTAGE instead of BOOTSTATE Some of the enum members are wrong. Fix them. Signed-off-by: Simon Glass --- common/board_f.c | 4 ++-- common/board_r.c | 4 ++-- common/spl/spl.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'common') diff --git a/common/board_f.c b/common/board_f.c index bae42674ebc..c4247cd75f9 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -823,9 +823,9 @@ static int initf_dm(void) #if defined(CONFIG_DM) && CONFIG_VAL(SYS_MALLOC_F_LEN) 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); - bootstage_accum(BOOTSTATE_ID_ACCUM_DM_F); + bootstage_accum(BOOTSTAGE_ID_ACCUM_DM_F); if (ret) return ret; #endif diff --git a/common/board_r.c b/common/board_r.c index 33efcf6ad5b..bd1ac353c7a 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -312,9 +312,9 @@ static int initr_dm(void) #ifdef CONFIG_TIMER gd->timer = NULL; #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); - bootstage_accum(BOOTSTATE_ID_ACCUM_DM_R); + bootstage_accum(BOOTSTAGE_ID_ACCUM_DM_R); if (ret) return ret; diff --git a/common/spl/spl.c b/common/spl/spl.c index fc5cbbbeba3..163e960a1e8 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -423,11 +423,11 @@ static int spl_common_init(bool setup_malloc) } } 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"); /* With CONFIG_SPL_OF_PLATDATA, bring in all devices */ 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) { debug("dm_init_and_scan() returned error %d\n", ret); return ret; -- cgit v1.3.1