From a52a068eb189c6268017a25d48f50f26b2a08a0b Mon Sep 17 00:00:00 2001
From: Bin Meng <bmeng.cn@gmail.com>
Date: Thu, 20 Aug 2015 06:40:18 -0700
Subject: [PATCH] x86: fsp: Delay x86_fsp_init() call a little bit
Move x86_fsp_init() call after initf_malloc() so that we can fix up
the gd->malloc_limit later.
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>
---
common/board_f.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/board_f.c b/common/board_f.c
index a2be57756a..fe75656b70 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -764,9 +764,6 @@ static init_fnc_t init_sequence_f[] = {
#ifdef CONFIG_OF_CONTROL
fdtdec_setup,
#endif
-#if defined(CONFIG_X86) && defined(CONFIG_HAVE_FSP)
- x86_fsp_init,
-#endif
#ifdef CONFIG_TRACE
trace_early_init,
#endif
@@ -774,6 +771,9 @@ static init_fnc_t init_sequence_f[] = {
#if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx)
/* TODO: can this go into arch_cpu_init()? */
probecpu,
+#endif
+#if defined(CONFIG_X86) && defined(CONFIG_HAVE_FSP)
+ x86_fsp_init,
#endif
arch_cpu_init, /* basic arch cpu dependent setup */
mark_bootstage,
--
2.39.5