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

drivers/intel/fsp1_1: Drop s3_resume parameter to load_vbt() 

Change-Id: Iaba88026906132b96fe3db3f05950df0e7eef896
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50002
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
Kyösti Mälkki 2021-01-24 18:06:26 +02:00
parent d0bc92df73
commit 0a54685b29
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,6 +18,6 @@ void mainboard_silicon_init_params(SILICON_INIT_UPD *params);
void soc_display_silicon_init_params(const SILICON_INIT_UPD *old, void soc_display_silicon_init_params(const SILICON_INIT_UPD *old,
SILICON_INIT_UPD *new); SILICON_INIT_UPD *new);
const struct cbmem_entry *soc_load_logo(SILICON_INIT_UPD *params); const struct cbmem_entry *soc_load_logo(SILICON_INIT_UPD *params);
void load_vbt(uint8_t s3_resume, SILICON_INIT_UPD *params); void load_vbt(SILICON_INIT_UPD *params);
#endif /* _INTEL_COMMON_RAMSTAGE_H_ */ #endif /* _INTEL_COMMON_RAMSTAGE_H_ */

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

@ -82,7 +82,7 @@ void fsp_run_silicon_init(FSP_INFO_HEADER *fsp_info_header, int is_s3_wakeup)
/* Locate VBT and pass to FSP GOP */ /* Locate VBT and pass to FSP GOP */
if (CONFIG(RUN_FSP_GOP)) if (CONFIG(RUN_FSP_GOP))
load_vbt(is_s3_wakeup, &silicon_init_params); load_vbt(&silicon_init_params);
mainboard_silicon_init_params(&silicon_init_params); mainboard_silicon_init_params(&silicon_init_params);
if (CONFIG(FSP1_1_DISPLAY_LOGO) && !is_s3_wakeup) if (CONFIG(FSP1_1_DISPLAY_LOGO) && !is_s3_wakeup)

5
src/drivers/intel/fsp1_1/vbt.c
View File

@ -1,5 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
#include <acpi/acpi.h>
#include <bootmode.h> #include <bootmode.h>
#include <console/console.h> #include <console/console.h>
#include <drivers/intel/gma/opregion.h> #include <drivers/intel/gma/opregion.h>
@ -8,13 +9,13 @@
#include <lib.h> #include <lib.h>
/* Locate VBT and pass it to FSP GOP */ /* Locate VBT and pass it to FSP GOP */
void load_vbt(uint8_t s3_resume, SILICON_INIT_UPD *params) void load_vbt(SILICON_INIT_UPD *params)
{ {
const optionrom_vbt_t *vbt_data = NULL; const optionrom_vbt_t *vbt_data = NULL;
size_t vbt_len; size_t vbt_len;
/* Check boot mode - for S3 resume path VBT loading is not needed */ /* Check boot mode - for S3 resume path VBT loading is not needed */
if (s3_resume) { if (acpi_is_wakeup_s3()) {
printk(BIOS_DEBUG, "S3 resume do not pass VBT to GOP\n"); printk(BIOS_DEBUG, "S3 resume do not pass VBT to GOP\n");
} else if (display_init_required()) { } else if (display_init_required()) {
/* Get VBT data */ /* Get VBT data */