x86: fsp: Add comments about U-Boot entering start.S twice

Add some comments in start.S for the fact that with FSP U-Boot
actually enters the code twice. Also change to use fsp_init()
and fsp_continue for accuracy.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 687208fb3001f050fb589015986ad1df00d78458..273f08f52dd5c7095a80a99ceae92cc9d3021110 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -229,7 +229,7 @@ config FSP_TEMP_RAM_ADDR
        depends on HAVE_FSP
        default 0x2000000
        help
-         Stack top address which is used in FspInit after DRAM is ready and
+         Stack top address which is used in fsp_init() after DRAM is ready and
          CAR is disabled.
 
 config FSP_SYS_MALLOC_F_LEN

diff --git a/arch/x86/cpu/start.S b/arch/x86/cpu/start.S
index e2b5ef4b742173919401c1dd7ae99f84c00e6ae7..d072825bcdd92f304689fb46a9d580238b9dc04f 100644 (file)
--- a/arch/x86/cpu/start.S
+++ b/arch/x86/cpu/start.S
@@ -115,8 +115,10 @@ car_init_ret:
 #endif
 #else
        /*
-        * When we get here after car_init(), esp points to a temporary stack
-        * and esi holds the HOB list address returned by the FSP.
+        * U-Boot enters here twice. For the first time it comes from
+        * car_init_done() with esp points to a temporary stack and esi
+        * set to zero. For the second time it comes from fsp_init_done()
+        * with esi holding the HOB list address returned by the FSP.
         */
 #endif
        /* Set up global data */

diff --git a/arch/x86/lib/fsp/fsp_car.S b/arch/x86/lib/fsp/fsp_car.S
index afbf3f9baae19f059f06b5338ead3209b730b850..15b37512a5734ed5fdda8ece19becb8c654ac711 100644 (file)
--- a/arch/x86/lib/fsp/fsp_car.S
+++ b/arch/x86/lib/fsp/fsp_car.S
@@ -64,7 +64,7 @@ temp_ram_init_ret:
 .global fsp_init_done
 fsp_init_done:
        /*
-        * We come here from FspInit with eax pointing to the HOB list.
+        * We come here from fsp_continue() with eax pointing to the HOB list.
         * Save eax to esi temporarily.
         */
        movl    %eax, %esi