diff options
| author | Simon Glass <sjg@chromium.org> | 2020-05-10 11:39:59 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-05-18 17:33:33 -0400 |
| commit | b67eefdb6ec9467c41b1c0081f0823bbfff36b00 (patch) | |
| tree | 00af42da2d2af2016692411dc462cb83ec5f39b5 /common | |
| parent | e6f6f9e64882ddf242437c73fdd9ff06a8eb7c21 (diff) | |
| download | u-boot-b67eefdb6ec9467c41b1c0081f0823bbfff36b00.tar.gz | |
bootstage: Use BOOTSTAGE instead of BOOTSTATE
Some of the enum members are wrong. Fix them.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common')
| -rw-r--r-- | common/board_f.c | 4 | ||||
| -rw-r--r-- | common/board_r.c | 4 | ||||
| -rw-r--r-- | common/spl/spl.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/common/board_f.c b/common/board_f.c index bae42674eb..c4247cd75f 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 33efcf6ad5..bd1ac353c7 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 fc5cbbbeba..163e960a1e 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; |