Patch set updated for coreboot: driver/intel/fsp1_1: Utilise soc/intel/common for adding vbt.bin

[Rizwan Qureshi]

Rizwan Qureshi ([e-mail]) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/16610

-gerrit

commit f363eabb96181e840033fd20db4af62afed23d24
Author: Naresh G Solanki 
Date:   Thu Sep 15 18:14:28 2016 +0530

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 
    Signed-off-by: Rizwan Qureshi 
---
 src/drivers/intel/fsp1_1/Kconfig      | 6 +-----
 src/drivers/intel/fsp1_1/Makefile.inc | 7 -------
 src/drivers/intel/fsp1_1/fsp_gop.c    | 3 +--
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/drivers/intel/fsp1_1/Kconfig b/src/drivers/intel/fsp1_1/Kconfig
index 59b4797..17a5caf 100644
--- a/src/drivers/intel/fsp1_1/Kconfig
+++ b/src/drivers/intel/fsp1_1/Kconfig
@@ -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"
diff --git a/src/drivers/intel/fsp1_1/Makefile.inc b/src/drivers/intel/fsp1_1/Makefile.inc
index 3820a5d..4ea23f3 100644
--- a/src/drivers/intel/fsp1_1/Makefile.inc
+++ b/src/drivers/intel/fsp1_1/Makefile.inc
@@ -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
diff --git a/src/drivers/intel/fsp1_1/fsp_gop.c b/src/drivers/intel/fsp1_1/fsp_gop.c
index f531d76..6d905b2 100644
--- a/src/drivers/intel/fsp1_1/fsp_gop.c
+++ b/src/drivers/intel/fsp1_1/fsp_gop.c
@@ -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");