diff options
| author | Simon Glass <[email protected]> | 2024-09-29 19:49:49 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-10-11 11:44:48 -0600 |
| commit | f38956a687c42db8d9736e09df2d68705369950e (patch) | |
| tree | ea397b639b37d2651ae245509b5034786cf3e641 /include/spl.h | |
| parent | 371dc068bbf50c6ed6146c04ec83b644bcc79249 (diff) | |
include: Use CONFIG_XPL_BUILD instead of CONFIG_SPL_BUILD
Use the new symbol to refer to any 'SPL' build, including TPL and VPL
Signed-off-by: Simon Glass <[email protected]>
Diffstat (limited to 'include/spl.h')
| -rw-r--r-- | include/spl.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/spl.h b/include/spl.h index b2978d8bbaf..3fc50cd9195 100644 --- a/include/spl.h +++ b/include/spl.h @@ -53,7 +53,7 @@ static inline bool xpl_is_first_phase(void) if (IS_ENABLED(CONFIG_TPL_BUILD)) return true; } else if (IS_ENABLED(CONFIG_SPL)) { - if (IS_ENABLED(CONFIG_SPL_BUILD)) + if (IS_ENABLED(CONFIG_XPL_BUILD)) return true; } else { return true; @@ -92,7 +92,7 @@ enum xpl_phase_t { * * To include code only in SPL, you might do: * - * #if defined(CONFIG_SPL_BUILD) && !defined(CONFIG_TPL_BUILD) + * #if defined(CONFIG_XPL_BUILD) && !defined(CONFIG_TPL_BUILD) * ... * #endif * @@ -104,7 +104,7 @@ enum xpl_phase_t { * * To include code only in U-Boot proper, you might do: * - * #ifndef CONFIG_SPL_BUILD + * #ifndef CONFIG_XPL_BUILD * ... * #endif * @@ -122,7 +122,7 @@ static inline enum xpl_phase_t xpl_phase(void) return PHASE_TPL; #elif defined(CONFIG_VPL_BUILD) return PHASE_VPL; -#elif defined(CONFIG_SPL_BUILD) +#elif defined(CONFIG_XPL_BUILD) return PHASE_SPL; #else DECLARE_GLOBAL_DATA_PTR; @@ -137,7 +137,7 @@ static inline enum xpl_phase_t xpl_phase(void) /* returns true if in U-Boot proper, false if in xPL */ static inline bool not_xpl(void) { -#ifdef CONFIG_SPL_BUILD +#ifdef CONFIG_XPL_BUILD return false; #endif @@ -166,7 +166,7 @@ static inline enum xpl_phase_t xpl_prev_phase(void) return PHASE_NONE; #elif defined(CONFIG_VPL_BUILD) return PHASE_TPL; /* VPL requires TPL */ -#elif defined(CONFIG_SPL_BUILD) +#elif defined(CONFIG_XPL_BUILD) return IS_ENABLED(CONFIG_VPL) ? PHASE_VPL : IS_ENABLED(CONFIG_TPL) ? PHASE_TPL : PHASE_NONE; @@ -239,7 +239,7 @@ static inline const char *xpl_prefix(enum xpl_phase_t phase) } /* A string name for SPL or TPL */ -#ifdef CONFIG_SPL_BUILD +#ifdef CONFIG_XPL_BUILD # ifdef CONFIG_TPL_BUILD # define SPL_TPL_NAME "TPL" # elif defined(CONFIG_VPL_BUILD) |