x86: Convert arch_fsp_init() to use events

Convert this to use events instead of calling a function directly in the
init sequence.

Rename it to arch_fsp_init_f() to distinguish it from the one that happens
after relocation.

For FSPv2 nothing needs to be done here, so drop the empty function.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/x86/lib/fsp1/fsp_common.c b/arch/x86/lib/fsp1/fsp_common.c
index 20926171822dd3518666a91920e2c80aa1472ba9..df18f47675628cd2e2138f744aed733a7c4c0c32 100644 (file)
--- a/arch/x86/lib/fsp1/fsp_common.c
+++ b/arch/x86/lib/fsp1/fsp_common.c
@@ -101,3 +101,4 @@ int arch_fsp_init(void)
 
        return 0;
 }
+EVENT_SPY_SIMPLE(EVT_FSP_INIT_F, arch_fsp_init);

diff --git a/arch/x86/lib/fsp2/fsp_common.c b/arch/x86/lib/fsp2/fsp_common.c
index 20c3f6406adf08386d3a23592d8fc9dedf24fc95..d802a86967d5c83ba0220cf4834287d38727de64 100644 (file)
--- a/arch/x86/lib/fsp2/fsp_common.c
+++ b/arch/x86/lib/fsp2/fsp_common.c
@@ -8,11 +8,6 @@
 #include <init.h>
 #include <asm/fsp/fsp_support.h>
 
-int arch_fsp_init(void)
-{
-       return 0;
-}
-
 void board_final_cleanup(void)
 {
        u32 status;

diff --git a/common/board_f.c b/common/board_f.c
index a485ba62fa17831c44bd5e62c822920aa76e42f2..46008bac65959270df11639bb81990a5f2dc5a64 100644 (file)
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -855,9 +855,7 @@ static const init_fnc_t init_sequence_f[] = {
 #if defined(CONFIG_CONSOLE_RECORD_INIT_F)
        console_record_init,
 #endif
-#if defined(CONFIG_HAVE_FSP)
-       arch_fsp_init,
-#endif
+       INITCALL_EVENT(EVT_FSP_INIT_F),
        arch_cpu_init,          /* basic arch cpu dependent setup */
        mach_cpu_init,          /* SoC/machine dependent CPU setup */
        initf_dm,

diff --git a/common/event.c b/common/event.c
index 55f6932ef62c57fd48f99d443ed355ff969c7484..8a61908888454c4b32b5141bcf817c3934ca93e2 100644 (file)
--- a/common/event.c
+++ b/common/event.c
@@ -35,6 +35,7 @@ const char *const type_name[] = {
 
        /* init hooks */
        "misc_init_f",
+       "fsp_init_r",
 
        /* Fpga load hook */
        "fpga_load",

diff --git a/include/event.h b/include/event.h
index b2cfd65c9f8b5d13f14e43220870ee6f0e27342c..85269aa317aa08f4b563f91330a8ddf4fd362dfb 100644 (file)
--- a/include/event.h
+++ b/include/event.h
@@ -32,6 +32,15 @@ enum event_t {
        /* Init hooks */
        EVT_MISC_INIT_F,
 
+       /*
+        * Emitted before relocation to set up Firmware Support Package
+        *
+        * Where U-Boot relies on binary blobs to handle part of the system
+        * init, this event can be used to set up the blobs. This is used on
+        * some Intel platforms
+        */
+       EVT_FSP_INIT_F,
+
        /* Fpga load hook */
        EVT_FPGA_LOAD,
 

diff --git a/include/init.h b/include/init.h
index 3bf30476a2e0d613564494953c15af36f63f9145..1bf76e4eff7256679ccc14f9f21630e4bf1f0003 100644 (file)
--- a/include/init.h
+++ b/include/init.h
@@ -57,17 +57,6 @@ int arch_cpu_init(void);
  */
 int mach_cpu_init(void);
 
-/**
- * arch_fsp_init() - perform firmware support package init
- *
- * Where U-Boot relies on binary blobs to handle part of the system init, this
- * function can be used to set up the blobs. This is used on some Intel
- * platforms.
- *
- * Return: 0
- */
-int arch_fsp_init(void);
-
 /**
  * arch_fsp_init() - perform post-relocation firmware support package init
  *