diff --git a/common/board_f.c b/common/board_f.c
index 0a1ef1a8a881ec6f51de9734b1885ebc7b2cc0d3..f5054985d012ea1295d4c6166d727cae173f0637 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -706,11 +706,8 @@ static int jump_to_copy(void)
 /* Record the board_init_f() bootstage (after arch_cpu_init()) */
 static int initf_bootstage(void)
 {
-#if defined(CONFIG_SPL_BOOTSTAGE) && defined(CONFIG_BOOTSTAGE_STASH)
-	bool from_spl = true;
-#else
-	bool from_spl = false;
-#endif
+	bool from_spl = IS_ENABLED(CONFIG_SPL_BOOTSTAGE) &&
+			IS_ENABLED(CONFIG_BOOTSTAGE_STASH);
 	int ret;
 
 	ret = bootstage_init(!from_spl);