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>

diff --git a/common/board_f.c b/common/board_f.c
index 6a8cc3b52961e5a4d33bc263992b4a255e861272..c0451bd9ea588197010563385a335c25f4dbab1f 100644 (file)
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -772,9 +772,6 @@ static init_fnc_t init_sequence_f[] = {
 #ifdef CONFIG_OF_CONTROL
        fdtdec_setup,
 #endif
 #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
 #ifdef CONFIG_TRACE
        trace_early_init,
 #endif


@@ -782,6 +779,9 @@ static init_fnc_t init_sequence_f[] = {
 #if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx)
        /* TODO: can this go into arch_cpu_init()? */
        probecpu,
 #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,
 #endif
        arch_cpu_init,          /* basic arch cpu dependent setup */
        mark_bootstage,