Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-28 16:48:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

xpl: Rename spl_phase to xpl_phase_t

Browse source 
This name fits better with the new naming scheme, so update it.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2024-09-29 19:49:35 -06:00 • committed by Tom Rini
parent 713bfc58f9
commit 41ea75aa00
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/sandbox/cpu/spl.c
View file

@ -91,7 +91,7 @@ static int load_from_image(struct spl_image_info *spl_image,
struct spl_boot_device *bootdev) struct spl_boot_device *bootdev)
{ {
struct sandbox_state *state = state_get_current(); struct sandbox_state *state = state_get_current();
enum u_boot_phase next_phase; enum xpl_phase_t next_phase;
const char *fname; const char *fname;
ulong pos, size; ulong pos, size;
int full_size; int full_size;

2
common/spl/spl.c
View file

@ -441,7 +441,7 @@ static inline int write_spl_handoff(void) { return 0; }
*/ */
static enum bootstage_id get_bootstage_id(bool start) static enum bootstage_id get_bootstage_id(bool start)
{ {
enum u_boot_phase phase = spl_phase(); enum xpl_phase_t phase = spl_phase();
if (IS_ENABLED(CONFIG_TPL_BUILD) && phase == PHASE_TPL) if (IS_ENABLED(CONFIG_TPL_BUILD) && phase == PHASE_TPL)
return start ? BOOTSTAGE_ID_START_TPL : BOOTSTAGE_ID_END_TPL; return start ? BOOTSTAGE_ID_START_TPL : BOOTSTAGE_ID_END_TPL;

2
doc/device-tree-bindings/bootph.yaml
View file

@ -83,6 +83,6 @@ properties:
bootph-all: bootph-all:
type: boolean type: boolean
description: description:
Include this node in all phases (for U-Boot see enum u_boot_phase). Include this node in all phases (for U-Boot see enum xpl_phase_t).
additionalProperties: true additionalProperties: true

12
include/spl.h
View file

@ -62,7 +62,7 @@ static inline bool xpl_is_first_phase(void)
return false; return false;
} }
enum u_boot_phase { enum xpl_phase_t {
PHASE_NONE, /* Invalid phase, signifying before U-Boot */ PHASE_NONE, /* Invalid phase, signifying before U-Boot */
PHASE_TPL, /* Running in TPL */ PHASE_TPL, /* Running in TPL */
PHASE_VPL, /* Running in VPL */ PHASE_VPL, /* Running in VPL */
@ -116,7 +116,7 @@ enum u_boot_phase {
* *
* Return: U-Boot phase * Return: U-Boot phase
*/ */
static inline enum u_boot_phase spl_phase(void) static inline enum xpl_phase_t spl_phase(void)
{ {
#ifdef CONFIG_TPL_BUILD #ifdef CONFIG_TPL_BUILD
return PHASE_TPL; return PHASE_TPL;
@ -150,7 +150,7 @@ static inline bool spl_in_proper(void)
* 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 u_boot_phase spl_prev_phase(void) static inline enum xpl_phase_t spl_prev_phase(void)
{ {
#ifdef CONFIG_TPL_BUILD #ifdef CONFIG_TPL_BUILD
return PHASE_NONE; return PHASE_NONE;
@ -172,7 +172,7 @@ static inline enum u_boot_phase spl_prev_phase(void)
* 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 u_boot_phase spl_next_phase(void) static inline enum xpl_phase_t spl_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;
@ -188,7 +188,7 @@ static inline enum u_boot_phase spl_next_phase(void)
* *
* Return: phase name * Return: phase name
*/ */
static inline const char *spl_phase_name(enum u_boot_phase phase) static inline const char *spl_phase_name(enum xpl_phase_t phase)
{ {
switch (phase) { switch (phase) {
case PHASE_TPL: case PHASE_TPL:
@ -211,7 +211,7 @@ static inline const char *spl_phase_name(enum u_boot_phase phase)
* @phase: Phase to look up * @phase: Phase to look up
* Return: phase prefix ("spl", "tpl", etc.) * Return: phase prefix ("spl", "tpl", etc.)
*/ */
static inline const char *spl_phase_prefix(enum u_boot_phase phase) static inline const char *spl_phase_prefix(enum xpl_phase_t phase)
{ {
switch (phase) { switch (phase) {
case PHASE_TPL: case PHASE_TPL: