dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-30 06:51:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

x86: Convert arch_fsp_init() to use events

Browse Source 
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>
This commit is contained in:
Simon Glass
2023-08-21 21:16:59 -06:00
committed by Tom Rini
parent 12be60daab
commit 13a7db9ab1
6 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/x86/lib/fsp1/fsp_common.c
View File

@@ -101,3 +101,4 @@ int arch_fsp_init(void)
return 0; return 0;
} }
EVENT_SPY_SIMPLE(EVT_FSP_INIT_F, arch_fsp_init);

5
arch/x86/lib/fsp2/fsp_common.c
View File

@@ -8,11 +8,6 @@
#include <init.h> #include <init.h>
#include <asm/fsp/fsp_support.h> #include <asm/fsp/fsp_support.h>
int arch_fsp_init(void)
{
return 0;
}
void board_final_cleanup(void) void board_final_cleanup(void)
{ {
u32 status; u32 status;

4
common/board_f.c
View File

@@ -855,9 +855,7 @@ static const init_fnc_t init_sequence_f[] = {
#if defined(CONFIG_CONSOLE_RECORD_INIT_F) #if defined(CONFIG_CONSOLE_RECORD_INIT_F)
console_record_init, console_record_init,
#endif #endif
#if defined(CONFIG_HAVE_FSP) INITCALL_EVENT(EVT_FSP_INIT_F),
arch_fsp_init,
#endif
arch_cpu_init, /* basic arch cpu dependent setup */ arch_cpu_init, /* basic arch cpu dependent setup */
mach_cpu_init, /* SoC/machine dependent CPU setup */ mach_cpu_init, /* SoC/machine dependent CPU setup */
initf_dm, initf_dm,

1
common/event.c
View File

@@ -35,6 +35,7 @@ const char *const type_name[] = {
/* init hooks */ /* init hooks */
"misc_init_f", "misc_init_f",
"fsp_init_r",
/* Fpga load hook */ /* Fpga load hook */
"fpga_load", "fpga_load",

9
include/event.h
View File

@@ -32,6 +32,15 @@ enum event_t {
/* Init hooks */ /* Init hooks */
EVT_MISC_INIT_F, 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 */ /* Fpga load hook */
EVT_FPGA_LOAD, EVT_FPGA_LOAD,

11
include/init.h
View File

@@ -57,17 +57,6 @@ int arch_cpu_init(void);
*/ */
int mach_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 * arch_fsp_init() - perform post-relocation firmware support package init
* *