colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xpl: Rename spl_next_phase() and spl_prev_phase()

Browse Source 
Rename this to use the xpl prefix.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2024-09-29 19:49:39 -06:00
committed by Tom Rini
parent 44a4c8e93f
commit 6c49fc5882
6 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/sandbox/cpu/spl.c
View File

@@ -28,7 +28,7 @@ int sandbox_find_next_phase(char *fname, int maxlen, bool use_img)
int ret; int ret;
cur_prefix = spl_phase_prefix(xpl_phase()); 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); ret = os_find_u_boot(fname, maxlen, use_img, cur_prefix, next_prefix);
if (ret) if (ret)
return log_msg_ret("find", 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)) if (!IS_ENABLED(CONFIG_SANDBOX_VPL))
return -ENOENT; return -ENOENT;
next_phase = spl_next_phase(); next_phase = xpl_next_phase();
pos = spl_get_image_pos(); pos = spl_get_image_pos();
size = spl_get_image_size(); size = spl_get_image_size();
if (pos == BINMAN_SYM_MISSING || size == BINMAN_SYM_MISSING) { if (pos == BINMAN_SYM_MISSING || size == BINMAN_SYM_MISSING) {

2
arch/x86/lib/tpl.c
View File

@@ -103,7 +103,7 @@ int spl_spi_load_image(void)
void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image) 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); (ulong)spl_image->entry_point);
#ifdef DEBUG #ifdef DEBUG
print_buffer(spl_image->entry_point, (void *)spl_image->entry_point, 1, print_buffer(spl_image->entry_point, (void *)spl_image->entry_point, 1,

2
common/bloblist.c
View File

@@ -512,7 +512,7 @@ int bloblist_init(void)
*/ */
bool from_boot_arg = fixed && xpl_is_first_phase(); 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; from_addr = false;
if (fixed) if (fixed)
addr = IF_ENABLED_INT(CONFIG_BLOBLIST_FIXED, addr = IF_ENABLED_INT(CONFIG_BLOBLIST_FIXED,

14
common/spl/spl.c
View File

@@ -176,10 +176,10 @@ ulong spl_get_image_pos(void)
return BINMAN_SYM_MISSING; return BINMAN_SYM_MISSING;
#ifdef CONFIG_VPL #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); return binman_sym(ulong, u_boot_vpl_any, image_pos);
#endif #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_spl_any, image_pos) :
binman_sym(ulong, u_boot_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; return BINMAN_SYM_MISSING;
#ifdef CONFIG_VPL #ifdef CONFIG_VPL
if (spl_next_phase() == PHASE_VPL) if (xpl_next_phase() == PHASE_VPL)
return binman_sym(ulong, u_boot_vpl_any, size); return binman_sym(ulong, u_boot_vpl_any, size);
#endif #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_spl_any, size) :
binman_sym(ulong, u_boot_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) ulong spl_get_image_text_base(void)
{ {
#ifdef CONFIG_VPL #ifdef CONFIG_VPL
if (spl_next_phase() == PHASE_VPL) if (xpl_next_phase() == PHASE_VPL)
return CONFIG_VPL_TEXT_BASE; return CONFIG_VPL_TEXT_BASE;
#endif #endif
return spl_next_phase() == PHASE_SPL ? CONFIG_SPL_TEXT_BASE : return xpl_next_phase() == PHASE_SPL ? CONFIG_SPL_TEXT_BASE :
CONFIG_TEXT_BASE; CONFIG_TEXT_BASE;
} }
@@ -762,7 +762,7 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
os = spl_image.os; os = spl_image.os;
if (os == IH_OS_U_BOOT) { 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) { } else if (CONFIG_IS_ENABLED(ATF) && os == IH_OS_ARM_TRUSTED_FIRMWARE) {
debug("Jumping to U-Boot via ARM Trusted Firmware\n"); debug("Jumping to U-Boot via ARM Trusted Firmware\n");
spl_fixup_fdt(spl_image_fdt_addr(&spl_image)); spl_fixup_fdt(spl_image_fdt_addr(&spl_image));

8
include/spl.h
View File

@@ -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 * Return: the previous phase from this one, e.g. if called in SPL this returns
* PHASE_TPL, if TPL is enabled * 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 #ifdef CONFIG_TPL_BUILD
return PHASE_NONE; 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 * Return: the next phase from this one, e.g. if called in TPL this returns
* PHASE_SPL * 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 #ifdef CONFIG_TPL_BUILD
return IS_ENABLED(CONFIG_VPL) ? PHASE_VPL : PHASE_SPL; return IS_ENABLED(CONFIG_VPL) ? PHASE_VPL : PHASE_SPL;

2
lib/fdtdec.c
View File

@@ -1676,7 +1676,7 @@ int fdtdec_setup(void)
* not whether this phase creates one. * not whether this phase creates one.
*/ */
if (CONFIG_IS_ENABLED(BLOBLIST) && if (CONFIG_IS_ENABLED(BLOBLIST) &&
(spl_prev_phase() != PHASE_TPL || (xpl_prev_phase() != PHASE_TPL ||
!IS_ENABLED(CONFIG_TPL_BLOBLIST))) { !IS_ENABLED(CONFIG_TPL_BLOBLIST))) {
ret = bloblist_maybe_init(); ret = bloblist_maybe_init();
if (!ret) { if (!ret) {