From: Lukas Funke <lukas.fu...@weidmueller.com>
Some architectures use spl_board_init() in their architecture specific
implementation. Board developers should be able to add board specific
implementation via spl_board_init(). Hence, introduce a spl_arch_init()
method which is called right before spl_board_init() for architecture
specific implementation.
Signed-off-by: Lukas Funke <lukas.fu...@weidmueller.com>
---
common/spl/Kconfig | 7 +++++++
common/spl/spl.c | 3 +++
include/spl.h | 8 ++++++++
3 files changed, 18 insertions(+)
diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 6405374bcc..1a987037bb 100644
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -272,6 +272,13 @@ config SPL_TEXT_BASE
help
The address in memory that SPL will be running from.
+config SPL_ARCH_INIT
+ bool "Call arch-specific initialization in SPL"
+ help
+ If this option is enabled, U-Boot will call the function
+ spl_arch_init() from board_init_r(). This function should be
+ provided by the architecture.
+
config SPL_BOARD_INIT
bool "Call board-specific initialization in SPL"
help
diff --git a/common/spl/spl.c b/common/spl/spl.c
index b65c439e7a..2f2deae14f 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -711,6 +711,9 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
}
}
+ if (CONFIG_IS_ENABLED(ARCH_INIT))
+ spl_arch_init();
+
if (CONFIG_IS_ENABLED(BOARD_INIT))
spl_board_init();
diff --git a/include/spl.h b/include/spl.h
index 043875f10f..2d23c8c0de 100644
--- a/include/spl.h
+++ b/include/spl.h
@@ -816,6 +816,14 @@ int spl_early_init(void);
*/
int spl_init(void);
+/*
+ * spl_arch_init() - Do architecture-specific init in SPL
+ *
+ * If SPL_ARCH_INIT is enabled, this is called from board_init_r() before
+ * jumping to the next phase.
+ */
+void spl_arch_init(void);
+
/*
* spl_board_init() - Do board-specific init in SPL
*
--
2.30.2
