diff options
| author | Simon Glass <sjg@chromium.org> | 2024-09-29 19:49:36 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-10-11 11:44:47 -0600 |
| commit | 456bdb70def1fe371f964e82158a53f6baf1d3a4 (patch) | |
| tree | 798aa42b2237966a8c1ded8af85fb011b8f47fe9 /common | |
| parent | 41ea75aa00079ff8368fca53267671cee6289415 (diff) | |
| download | u-boot-456bdb70def1fe371f964e82158a53f6baf1d3a4.zip u-boot-456bdb70def1fe371f964e82158a53f6baf1d3a4.tar.gz u-boot-456bdb70def1fe371f964e82158a53f6baf1d3a4.tar.bz2 | |
xpl: Rename spl_phase() to xpl_phase()
Rename this function to indicate that it refers to any xPL phase.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common')
| -rw-r--r-- | common/board_f.c | 2 | ||||
| -rw-r--r-- | common/bootstage.c | 2 | ||||
| -rw-r--r-- | common/spl/spl.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/common/board_f.c b/common/board_f.c index 154675d..f1bd70f 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -397,7 +397,7 @@ __weak int arch_reserve_mmu(void) static int reserve_video_from_videoblob(void) { - if (IS_ENABLED(CONFIG_SPL_VIDEO_HANDOFF) && spl_phase() > PHASE_SPL) { + if (IS_ENABLED(CONFIG_SPL_VIDEO_HANDOFF) && xpl_phase() > PHASE_SPL) { struct video_handoff *ho; int ret = 0; diff --git a/common/bootstage.c b/common/bootstage.c index 49acc90..dca3314 100644 --- a/common/bootstage.c +++ b/common/bootstage.c @@ -489,7 +489,7 @@ int bootstage_unstash(const void *base, int size) for (rec = data->record + data->next_id, i = 0; i < hdr->count; i++, rec++) { rec->name = ptr; - if (spl_phase() == PHASE_SPL) + if (xpl_phase() == PHASE_SPL) rec->name = strdup(ptr); /* Assume no data corruption here */ diff --git a/common/spl/spl.c b/common/spl/spl.c index 9ed9192..6c297eb 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -441,7 +441,7 @@ static inline int write_spl_handoff(void) { return 0; } */ static enum bootstage_id get_bootstage_id(bool start) { - enum xpl_phase_t phase = spl_phase(); + enum xpl_phase_t phase = xpl_phase(); if (IS_ENABLED(CONFIG_TPL_BUILD) && phase == PHASE_TPL) return start ? BOOTSTAGE_ID_START_TPL : BOOTSTAGE_ID_END_TPL; @@ -476,7 +476,7 @@ static int spl_common_init(bool setup_malloc) log_debug("Failed to unstash bootstage: ret=%d\n", ret); } bootstage_mark_name(get_bootstage_id(true), - spl_phase_name(spl_phase())); + spl_phase_name(xpl_phase())); #if CONFIG_IS_ENABLED(LOG) ret = log_init(); if (ret) { @@ -493,7 +493,7 @@ static int spl_common_init(bool setup_malloc) } if (CONFIG_IS_ENABLED(DM)) { bootstage_start(BOOTSTAGE_ID_ACCUM_DM_SPL, - spl_phase() == PHASE_TPL ? "dm tpl" : "dm_spl"); + xpl_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(BOOTSTAGE_ID_ACCUM_DM_SPL); |