Rename this to use the xpl prefix.
Signed-off-by: Simon Glass sjg@chromium.org ---
arch/sandbox/cpu/spl.c | 4 ++-- arch/x86/lib/tpl.c | 2 +- common/bloblist.c | 2 +- common/spl/spl.c | 14 +++++++------- include/spl.h | 8 ++++---- lib/fdtdec.c | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/arch/sandbox/cpu/spl.c b/arch/sandbox/cpu/spl.c index 7497d90fb89..71d785f4c3e 100644 --- a/arch/sandbox/cpu/spl.c +++ b/arch/sandbox/cpu/spl.c @@ -28,7 +28,7 @@ int sandbox_find_next_phase(char *fname, int maxlen, bool use_img) int ret;
cur_prefix = spl_phase_prefix(xpl_phase()); - next_prefix = spl_phase_prefix(spl_next_phase()); + next_prefix = spl_phase_prefix(xpl_next_phase()); ret = os_find_u_boot(fname, maxlen, use_img, cur_prefix, next_prefix); if (ret) return log_msg_ret("find", ret); @@ -101,7 +101,7 @@ static int load_from_image(struct spl_image_info *spl_image, if (!IS_ENABLED(CONFIG_SANDBOX_VPL)) return -ENOENT;
- next_phase = spl_next_phase(); + next_phase = xpl_next_phase(); pos = spl_get_image_pos(); size = spl_get_image_size(); if (pos == BINMAN_SYM_MISSING || size == BINMAN_SYM_MISSING) { diff --git a/arch/x86/lib/tpl.c b/arch/x86/lib/tpl.c index 7c03dea0711..0606b4a1c67 100644 --- a/arch/x86/lib/tpl.c +++ b/arch/x86/lib/tpl.c @@ -103,7 +103,7 @@ int spl_spi_load_image(void)
void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image) { - debug("Jumping to %s at %lx\n", spl_phase_name(spl_next_phase()), + debug("Jumping to %s at %lx\n", spl_phase_name(xpl_next_phase()), (ulong)spl_image->entry_point); #ifdef DEBUG print_buffer(spl_image->entry_point, (void *)spl_image->entry_point, 1, diff --git a/common/bloblist.c b/common/bloblist.c index fb86789df42..6640ad1fd69 100644 --- a/common/bloblist.c +++ b/common/bloblist.c @@ -512,7 +512,7 @@ int bloblist_init(void) */ bool from_boot_arg = fixed && xpl_is_first_phase();
- if (spl_prev_phase() == PHASE_TPL && !IS_ENABLED(CONFIG_TPL_BLOBLIST)) + if (xpl_prev_phase() == PHASE_TPL && !IS_ENABLED(CONFIG_TPL_BLOBLIST)) from_addr = false; if (fixed) addr = IF_ENABLED_INT(CONFIG_BLOBLIST_FIXED, diff --git a/common/spl/spl.c b/common/spl/spl.c index a0de495e529..a221b64f81d 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -176,10 +176,10 @@ ulong spl_get_image_pos(void) return BINMAN_SYM_MISSING;
#ifdef CONFIG_VPL - if (spl_next_phase() == PHASE_VPL) + if (xpl_next_phase() == PHASE_VPL) return binman_sym(ulong, u_boot_vpl_any, image_pos); #endif - return spl_next_phase() == PHASE_SPL ? + return xpl_next_phase() == PHASE_SPL ? binman_sym(ulong, u_boot_spl_any, image_pos) : binman_sym(ulong, u_boot_any, image_pos); } @@ -190,10 +190,10 @@ ulong spl_get_image_size(void) return BINMAN_SYM_MISSING;
#ifdef CONFIG_VPL - if (spl_next_phase() == PHASE_VPL) + if (xpl_next_phase() == PHASE_VPL) return binman_sym(ulong, u_boot_vpl_any, size); #endif - return spl_next_phase() == PHASE_SPL ? + return xpl_next_phase() == PHASE_SPL ? binman_sym(ulong, u_boot_spl_any, size) : binman_sym(ulong, u_boot_any, size); } @@ -201,10 +201,10 @@ ulong spl_get_image_size(void) ulong spl_get_image_text_base(void) { #ifdef CONFIG_VPL - if (spl_next_phase() == PHASE_VPL) + if (xpl_next_phase() == PHASE_VPL) return CONFIG_VPL_TEXT_BASE; #endif - return spl_next_phase() == PHASE_SPL ? CONFIG_SPL_TEXT_BASE : + return xpl_next_phase() == PHASE_SPL ? CONFIG_SPL_TEXT_BASE : CONFIG_TEXT_BASE; }
@@ -762,7 +762,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(spl_next_phase())); + debug("Jumping to %s...\n", spl_phase_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)); diff --git a/include/spl.h b/include/spl.h index 3281b02d63b..dfa56e49c53 100644 --- a/include/spl.h +++ b/include/spl.h @@ -155,12 +155,12 @@ static inline bool is_xpl(void) }
/** - * spl_prev_phase() - Figure out the previous U-Boot phase + * xpl_prev_phase() - Figure out the previous U-Boot phase * * Return: the previous phase from this one, e.g. if called in SPL this returns * PHASE_TPL, if TPL is enabled */ -static inline enum xpl_phase_t spl_prev_phase(void) +static inline enum xpl_phase_t xpl_prev_phase(void) { #ifdef CONFIG_TPL_BUILD return PHASE_NONE; @@ -177,12 +177,12 @@ static inline enum xpl_phase_t spl_prev_phase(void) }
/** - * spl_next_phase() - Figure out the next U-Boot phase + * xpl_next_phase() - Figure out the next U-Boot phase * * Return: the next phase from this one, e.g. if called in TPL this returns * PHASE_SPL */ -static inline enum xpl_phase_t spl_next_phase(void) +static inline enum xpl_phase_t xpl_next_phase(void) { #ifdef CONFIG_TPL_BUILD return IS_ENABLED(CONFIG_VPL) ? PHASE_VPL : PHASE_SPL; diff --git a/lib/fdtdec.c b/lib/fdtdec.c index cdc2edbd61e..b2d38795a48 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -1676,7 +1676,7 @@ int fdtdec_setup(void) * not whether this phase creates one. */ if (CONFIG_IS_ENABLED(BLOBLIST) && - (spl_prev_phase() != PHASE_TPL || + (xpl_prev_phase() != PHASE_TPL || !IS_ENABLED(CONFIG_TPL_BLOBLIST))) { ret = bloblist_maybe_init(); if (!ret) {