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

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

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.

Change-Id: I08f2556a34f83a0ea2b67b003e51dcace994361b
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>
This commit is contained in:
Naresh G Solanki 2016-09-15 18:14:28 +05:30 committed by Martin Roth
parent 767009aeab
commit 21130c6508
3 changed files with 2 additions and 14 deletions
Show Stats 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 config GOP_SUPPORT
bool "Enable GOP support" bool "Enable GOP support"
default n default n
select ADD_VBT_DATA_FILE
config USE_GENERIC_FSP_CAR_INC config USE_GENERIC_FSP_CAR_INC
bool 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 The chipset can select this to use a generic cache_as_ram.inc file
that should be good for all FSP based platforms. 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 config CHECKLIST_DATA_FILE_LOCATION
string string
default "src/vendorcode/intel/fsp/fsp1_1/checklist" 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 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 # Add the FSP binary to the cbfs image
ifeq ($(CONFIG_HAVE_FSP_BIN),y) ifeq ($(CONFIG_HAVE_FSP_BIN),y)
cbfs-files-y += fsp.bin 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; } vbt;
/* Locate the vbt file in cbfs */ /* Locate the vbt file in cbfs */
vbt.data = cbfs_boot_map_with_leak("vbt.bin", CBFS_TYPE_OPTIONROM, vbt.data = cbfs_boot_map_with_leak("vbt.bin", CBFS_TYPE_RAW, &vbt_size);
&vbt_size);
if (!vbt.data) { if (!vbt.data) {
printk(BIOS_INFO, printk(BIOS_INFO,
"FSP_INFO: VBT data file (vbt.bin) not found in CBFS"); "FSP_INFO: VBT data file (vbt.bin) not found in CBFS");