The XPL_BUILD symbol is set for all xPL phases, i.e. TPL, VPL and SPL. Conditional guards that test for both XPL_BUILD and TPL_BUILD symbols are therefore redundant.
Drop the redundant TPL_BUILD symbol check from conditional guards that also test for the XPL_BUILD symbol to cleanup from an old SPL to XPL symbol rename. Signed-off-by: Jonas Karlman <[email protected]> --- arch/x86/cpu/apollolake/fsp_bindings.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/cpu/apollolake/fsp_bindings.c b/arch/x86/cpu/apollolake/fsp_bindings.c index b4bb677f5cde..4b85fddbc8ad 100644 --- a/arch/x86/cpu/apollolake/fsp_bindings.c +++ b/arch/x86/cpu/apollolake/fsp_bindings.c @@ -653,7 +653,7 @@ int fsp_m_update_config_from_dtb(ofnode node, struct fsp_m_config *cfg) } #endif -#if !defined(CONFIG_XPL_BUILD) && !defined(CONFIG_TPL_BUILD) +#if !defined(CONFIG_XPL_BUILD) const struct fsp_binding fsp_s_bindings[] = { { .type = FSP_UINT8, -- 2.54.0
