summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorSimon Glass <[email protected]>2024-09-29 19:49:40 -0600
committerTom Rini <[email protected]>2024-10-11 11:44:47 -0600
commit80580cd98167771a0aae4a6c4c7ffe6d7e70a155 (patch)
tree19aaef7965db7424a95698294897bff9d29086db /common
parent6c49fc5882baa2c496b03f8260a5b21ef48ed9c5 (diff)
xpl: Rename spl_phase_prefix() and spl_phase_name()
Use simpler names for these functions. Signed-off-by: Simon Glass <[email protected]>
Diffstat (limited to 'common')
-rw-r--r--common/spl/spl.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c
index ad5c309348b..9748a3fb3e9 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -475,8 +475,7 @@ static int spl_common_init(bool setup_malloc)
if (ret)
log_debug("Failed to unstash bootstage: ret=%d\n", ret);
}
- bootstage_mark_name(get_bootstage_id(true),
- spl_phase_name(xpl_phase()));
+ bootstage_mark_name(get_bootstage_id(true), xpl_name(xpl_phase()));
#if CONFIG_IS_ENABLED(LOG)
ret = log_init();
if (ret) {
@@ -762,7 +761,7 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
os = spl_image.os;
if (os == IH_OS_U_BOOT) {
- debug("Jumping to %s...\n", spl_phase_name(xpl_next_phase()));
+ debug("Jumping to %s...\n", xpl_name(xpl_next_phase()));
} else if (CONFIG_IS_ENABLED(ATF) && os == IH_OS_ARM_TRUSTED_FIRMWARE) {
debug("Jumping to U-Boot via ARM Trusted Firmware\n");
spl_fixup_fdt(spl_image_fdt_addr(&spl_image));