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

xpl: Rename u_boot_first_phase to xpl_is_first_phase()

Browse Source 
This is a better name for this function, so update it.

Tidy up the function comment to mention VPL.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2024-09-29 19:49:34 -06:00
committed by Tom Rini
parent 90fb55e042
commit 713bfc58f9
4 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/bloblist.c
View File

@@ -504,13 +504,13 @@ int bloblist_init(void)
* If U-Boot is not in the first phase, an existing bloblist must be
* at a fixed address.
*/
bool from_addr = fixed && !u_boot_first_phase();
bool from_addr = fixed && !xpl_is_first_phase();
/*
* If U-Boot is in the first phase that an arch custom routine should
* install the bloblist passed from previous loader to this fixed
* address.
*/
bool from_boot_arg = fixed && u_boot_first_phase();
bool from_boot_arg = fixed && xpl_is_first_phase();
if (spl_prev_phase() == PHASE_TPL && !IS_ENABLED(CONFIG_TPL_BLOBLIST))
from_addr = false;

4
common/spl/spl.c
View File

@@ -464,13 +464,13 @@ static int spl_common_init(bool setup_malloc)
gd->malloc_ptr = 0;
}
#endif
ret = bootstage_init(u_boot_first_phase());
ret = bootstage_init(xpl_is_first_phase());
if (ret) {
debug("%s: Failed to set up bootstage: ret=%d\n", __func__,
ret);
return ret;
}
if (!u_boot_first_phase()) {
if (!xpl_is_first_phase()) {
ret = bootstage_unstash_default();
if (ret)
log_debug("Failed to unstash bootstage: ret=%d\n", ret);