GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drivers/intel/fsp1_1: Make fsp_run_silicon_init public 

Remove the "static" declaration from fsp_run_silicon_init and declare
the routine in ramstage.h.  This routine can be called directly when FSP
is already in RAM.

TEST=Build and run on Galileo

Change-Id: Iddb32d00c5d4447eab5c95b0ad5c40309afa293e
Signed-off-by: Lee Leahy <leroy.p.leahy@intel.com>
Reviewed-on: https://review.coreboot.org/13630
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Lee Leahy 2016-02-08 08:37:53 -08:00 committed by Leroy P Leahy
parent 35852b9037
commit cff5f09e93
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/drivers/intel/fsp1_1/include/fsp/ramstage.h
View File

@ -23,6 +23,7 @@
/* Perform Intel silicon init. */
void intel_silicon_init(void);
void fsp_run_silicon_init(FSP_INFO_HEADER *fsp_info_header, int is_s3_wakeup);
/* Called after the silicon init code has run. */
void soc_after_silicon_init(void);
/* Initialize UPD data before SiliconInit call. */

8
src/drivers/intel/fsp1_1/ramstage.c
View File

@ -89,9 +89,8 @@ static void display_hob_info(FSP_INFO_HEADER *fsp_info_header)
"ERROR - Missing one or more required FSP HOBs!\n");
}
static void fsp_run_silicon_init(int is_s3_wakeup)
void fsp_run_silicon_init(FSP_INFO_HEADER *fsp_info_header, int is_s3_wakeup)
{
FSP_INFO_HEADER *fsp_info_header;
FSP_SILICON_INIT fsp_silicon_init;
SILICON_INIT_UPD *original_params;
SILICON_INIT_UPD silicon_init_params;
@ -99,8 +98,7 @@ static void fsp_run_silicon_init(int is_s3_wakeup)
UPD_DATA_REGION *upd_ptr;
VPD_DATA_REGION *vpd_ptr;
/* Find the FSP image */
fsp_info_header = fsp_get_fih();
/* Display the FSP header */
if (fsp_info_header == NULL) {
printk(BIOS_ERR, "FSP_INFO_HEADER not set!\n");
return;
@ -191,7 +189,7 @@ void intel_silicon_init(void)
/* FSP_INFO_HEADER is set as the program entry. */
fsp_update_fih(prog_entry(&fsp));
fsp_run_silicon_init(is_s3_wakeup);
fsp_run_silicon_init(fsp_get_fih(), is_s3_wakeup);
}
/* Initialize the UPD parameters for SiliconInit */