From af2f44267fdc006e47166187632f63d396822bed Mon Sep 17 00:00:00 2001
From: Kever Yang <kever.yang@rock-chips.com>
Date: Sat, 20 Jan 2018 18:00:26 +0800
Subject: [PATCH] spl: use different BOARD_INIT MACRO for spl and tpl
SPL and TPL may not always need spl_board_init() at the same time.
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
---
common/spl/Kconfig | 7 +++++++
common/spl/spl.c | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index d686b1ecbd..e1b91f5d89 100644
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -757,6 +757,13 @@ config TPL
if TPL
+config TPL_BOARD_INIT
+ bool "Call board-specific initialization in TPL"
+ help
+ If this option is enabled, U-Boot will call the function
+ spl_board_init() from board_init_r(). This function should be
+ provided by the board.
+
config TPL_LDSCRIPT
string "Linker script for the TPL stage"
depends on TPL
diff --git a/common/spl/spl.c b/common/spl/spl.c
index 76c1963611..1566acdbc3 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -407,7 +407,7 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
timer_init();
#endif
-#ifdef CONFIG_SPL_BOARD_INIT
+#if CONFIG_IS_ENABLED(BOARD_INIT)
spl_board_init();
#endif
--
2.39.5