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]> --- drivers/core/ofnode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c index 1388b4810317..75cae0d36b5b 100644 --- a/drivers/core/ofnode.c +++ b/drivers/core/ofnode.c @@ -1665,8 +1665,8 @@ int ofnode_read_simple_size_cells(ofnode node) bool ofnode_pre_reloc(ofnode node) { -#if defined(CONFIG_XPL_BUILD) || defined(CONFIG_TPL_BUILD) - /* for SPL and TPL the remaining nodes after the fdtgrep 1st pass +#if defined(CONFIG_XPL_BUILD) + /* for xPL the remaining nodes after the fdtgrep 1st pass * had property bootph-all or bootph-pre-sram/bootph-pre-ram. * They are removed in final dtb (fdtgrep 2nd pass) */ -- 2.54.0

