erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UPSTREAM: driver/intel/fsp1_1: Utilise soc/intel/common for adding vbt.bin

Browse source 
Remove fsp1.1  driver code that adds vbt.bin & use soc/intel/common
instead to add vbt.bin in cbfs.
Also, VBT blob is added to CBFS as RAW type hence when walking the
CBFS to find vbt.bin, search with type as RAW.

BUG=None
BRANCH=None
TEST=None

Change-Id: Iad0cfae45889b8d209840f8627ecdad794bf7e51
Signed-off-by: Naresh G Solanki <naresh.solanki@intel.com>
Signed-off-by: Rizwan Qureshi <rizwan.qureshi@intel.com>
Reviewed-on: https://review.coreboot.org/16610
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/388114
Commit-Ready: Furquan Shaikh <furquan@chromium.org>
Tested-by: Furquan Shaikh <furquan@chromium.org>
This commit is contained in:
Naresh G Solanki 2016-09-15 18:14:28 +05:30 • committed by chrome-bot
commit 83ec7d9233
3 changed files with 2 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/drivers/intel/fsp1_1/Kconfig
View file

@ -98,6 +98,7 @@ config FSP_USES_UPD
config GOP_SUPPORT
bool "Enable GOP support"
default n
select ADD_VBT_DATA_FILE
config USE_GENERIC_FSP_CAR_INC
bool
@ -106,11 +107,6 @@ config USE_GENERIC_FSP_CAR_INC
The chipset can select this to use a generic cache_as_ram.inc file
that should be good for all FSP based platforms.
config VBT_FILE
string "GOP Video BIOS table binary path"
depends on GOP_SUPPORT
default "3rdparty/blobs/mainboard/$(MAINBOARDDIR)/vbt.bin"
config CHECKLIST_DATA_FILE_LOCATION
string
default "src/vendorcode/intel/fsp/fsp1_1/checklist"

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

@ -44,13 +44,6 @@ CPPFLAGS_common += -Isrc/drivers/intel/fsp1_1/include
cpu_incs-$(CONFIG_USE_GENERIC_FSP_CAR_INC) += $(src)/drivers/intel/fsp1_1/cache_as_ram.inc
# Add the GOP Video BIOS Table to the cbfs image
cbfs-files-$(CONFIG_GOP_SUPPORT) += vbt.bin
vbt.bin-file := $(call strip_quotes,$(CONFIG_VBT_FILE))
vbt.bin-type := optionrom
# Add the FSP binary to the cbfs image
ifeq ($(CONFIG_HAVE_FSP_BIN),y)
cbfs-files-y += fsp.bin

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

@ -29,8 +29,7 @@ const optionrom_vbt_t *fsp_get_vbt(uint32_t *vbt_len)
} vbt;
/* Locate the vbt file in cbfs */
vbt.data = cbfs_boot_map_with_leak("vbt.bin", CBFS_TYPE_OPTIONROM,
&vbt_size);
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");