Emulation/switch-coreboot
1
0
Fork 0
mirror of https://github.com/fail0verflow/switch-coreboot.git synced 2025-05-04 01:39:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

UPSTREAM: drivers/fsp1_1: decouple VBT from execution of GOP driver

Browse source 
Commit 2e7f6cc introduced the 'no graphics init' option for
FSP 1.1 SoCs using a GOP driver to init the display, but selecting
that option while including a VBT breaks compilation for Braswell
and Skylake devices because the VBT and GOP driver are intertwined.

This patch decouples the VBT from the GOP driver execution,
allowing the 'no graphics init' option to compile (and work)
properly when CONFIG_ADD_VBT_DATA_FILE=y.

BUG=none
BRANCH=none
TEST=none

Change-Id: I25447b151e00c2505e7c6eff9411adbbadaa9848
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Original-Commit-Id: 660de34bbf
Original-Change-Id: Ifbcf32805177c290c4781b32bbcca679bcb0c297
Original-Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Original-Reviewed-on: https://review.coreboot.org/20210
Original-Reviewed-by: Nico Huber <nico.h@gmx.de>
Original-Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Original-Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Original-Reviewed-by: Youness Alaoui <snifikino@gmail.com>
Reviewed-on: https://chromium-review.googlesource.com/538572
Commit-Ready: Patrick Georgi <pgeorgi@chromium.org>
Tested-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-by: Stefan Reinauer <reinauer@google.com>
This commit is contained in:
Matt DeVillier 2017-06-13 16:54:00 -05:00 • committed by chrome-bot
parent f0d7e3a5df
commit 7d14a192ef
3 changed files with 40 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/drivers/intel/fsp1_1/Makefile.inc
View file

@ -38,7 +38,7 @@ ramstage-y += fsp_util.c
ramstage-y += hob.c
ramstage-y += ramstage.c
ramstage-y += stage_cache.c
ramstage-$(CONFIG_RUN_FSP_GOP) += vbt.c
ramstage-$(CONFIG_ADD_VBT_DATA_FILE) += vbt.c
ramstage-$(CONFIG_MMA) += mma_core.c
CPPFLAGS_common += -Isrc/drivers/intel/fsp1_1/include

39
src/drivers/intel/fsp1_1/fsp_gop.c
View file

@ -14,49 +14,10 @@
*/
#include <boot/coreboot_tables.h>
#include <cbfs.h>
#include <console/console.h>
#include <fsp/util.h>
#include <lib.h>
/* Reading VBT table from flash */
const optionrom_vbt_t *fsp_get_vbt(uint32_t *vbt_len)
{
size_t vbt_size;
union {
const optionrom_vbt_t *data;
uint32_t *signature;
} vbt;
/* Locate the vbt file in cbfs */
vbt.data = cbfs_boot_map_with_leak("vbt.bin", CBFS_TYPE_RAW, &vbt_size);
if (!vbt.data) {
printk(BIOS_INFO,
"FSP_INFO: VBT data file (vbt.bin) not found in CBFS");
return NULL;
}
/* Validate the vbt file */
if (*vbt.signature != VBT_SIGNATURE) {
printk(BIOS_WARNING,
"FSP_WARNING: Invalid signature in VBT data file (vbt.bin)!\n");
return NULL;
}
*vbt_len = vbt_size;
printk(BIOS_DEBUG, "FSP_INFO: VBT found at %p, 0x%08x bytes\n",
vbt.data, *vbt_len);
#if IS_ENABLED(CONFIG_DISPLAY_VBT)
/* Display the vbt file contents */
printk(BIOS_DEBUG, "VBT Data:\n");
hexdump(vbt.data, *vbt_len);
printk(BIOS_DEBUG, "\n");
#endif
/* Return the pointer to the vbt file data */
return vbt.data;
}
int fill_lb_framebuffer(struct lb_framebuffer *framebuffer)
{
VOID *hob_list_ptr;

39
src/drivers/intel/fsp1_1/vbt.c
View file

@ -15,10 +15,49 @@
*/
#include <bootmode.h>
#include <cbfs.h>
#include <console/console.h>
#include <fsp/ramstage.h>
#include <fsp/util.h>
/* Reading VBT table from flash */
const optionrom_vbt_t *fsp_get_vbt(uint32_t *vbt_len)
{
size_t vbt_size;
union {
const optionrom_vbt_t *data;
uint32_t *signature;
} vbt;
/* Locate the vbt file in cbfs */
vbt.data = cbfs_boot_map_with_leak("vbt.bin", CBFS_TYPE_RAW, &vbt_size);
if (!vbt.data) {
printk(BIOS_INFO,
"FSP_INFO: VBT data file (vbt.bin) not found in CBFS");
return NULL;
}
/* Validate the vbt file */
if (*vbt.signature != VBT_SIGNATURE) {
printk(BIOS_WARNING,
"FSP_WARNING: Invalid signature in VBT data file (vbt.bin)!\n");
return NULL;
}
*vbt_len = vbt_size;
printk(BIOS_DEBUG, "FSP_INFO: VBT found at %p, 0x%08x bytes\n",
vbt.data, *vbt_len);
#if IS_ENABLED(CONFIG_DISPLAY_VBT)
/* Display the vbt file contents */
printk(BIOS_DEBUG, "VBT Data:\n");
hexdump(vbt.data, *vbt_len);
printk(BIOS_DEBUG, "\n");
#endif
/* Return the pointer to the vbt file data */
return vbt.data;
}
/* Locate VBT and pass it to FSP GOP */
void load_vbt(uint8_t s3_resume, SILICON_INIT_UPD *params)
{