commit e49743fb1cc08defc3a8347cda740d013e7268e9
author Simon Glass <sjg@chromium.org> Tue Sep 26 08:14:20 2023 -0600
committer Tom Rini <trini@konsulko.com> Fri Oct 06 14:38:12 2023 -0400
tree 6ce30d56e0267d7780be5d7d0b1994b76bb7a8b4
parent 99bb53481db6de168ff1d0f34dcf7be4e9cc7a2b

spl: Drop #ifdefs for BOARD_INIT and watchdog

Avoid using the preprocessor for these checks.

Signed-off-by: Simon Glass <sjg@chromium.org>

common/spl/spl.c

diff --git a/common/spl/spl.c b/common/spl/spl.c
index d930d20..530ade5 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -778,13 +778,11 @@
 		}
 	}
 
-#if CONFIG_IS_ENABLED(BOARD_INIT)
-	spl_board_init();
-#endif
+	if (CONFIG_IS_ENABLED(BOARD_INIT))
+		spl_board_init();
 
-#if defined(CONFIG_SPL_WATCHDOG) && CONFIG_IS_ENABLED(WDT)
-	initr_watchdog();
-#endif
+	if (IS_ENABLED(CONFIG_SPL_WATCHDOG) && CONFIG_IS_ENABLED(WDT))
+		initr_watchdog();
 
 	if (IS_ENABLED(CONFIG_SPL_OS_BOOT) || CONFIG_IS_ENABLED(HANDOFF) ||
 	    IS_ENABLED(CONFIG_SPL_ATF))

include/spl.h

diff --git a/include/spl.h b/include/spl.h
index 0fedddd..ab06e32 100644
--- a/include/spl.h
+++ b/include/spl.h
@@ -707,9 +707,13 @@
  */
 int spl_init(void);
 
-#ifdef CONFIG_SPL_BOARD_INIT
+/*
+ * spl_board_init() - Do board-specific init in SPL
+ *
+ * If xPL_BOARD_INIT is enabled, this is called from board_init_r() before
+ * jumping to the next phase.
+ */
 void spl_board_init(void);
-#endif
 
 /**
  * spl_was_boot_source() - check if U-Boot booted from SPL