[coreboot-gerrit] New patch to review for coreboot: WIP: soc/intel/apollolake: Recipies for binary blobs

[Bora Guvendik (bora.guvendik@intel.com)]

Bora Guvendik (bora.guvendik at intel.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14802

-gerrit

commit d1938690c01c8eba7bcce78ad65b8312339ecc04
Author: Andrey Petrov <andrey.petrov at intel.com>
Date:   Fri Apr 15 21:33:18 2016 -0700

    WIP: soc/intel/apollolake: Recipies for binary blobs
    
    Add Kconfig/Makefile recipies to include FSP and .vbt blobs
    into the build.
    
    BUG=chrome-os-partner:51844
    BRANCH=none
    TEST=boots to chrome OS
    
    Change-Id: I678a3541e51e5fb3515f7038484bc27890a16f1d
    Signed-off-by: Andrey Petrov <andrey.petrov at intel.com>
---
 src/soc/intel/apollolake/Kconfig      | 31 +++++++++++++++++++++++++++++++
 src/soc/intel/apollolake/Makefile.inc | 12 ++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig
index 41a96c9..ba95f15 100644
--- a/src/soc/intel/apollolake/Kconfig
+++ b/src/soc/intel/apollolake/Kconfig
@@ -122,4 +122,35 @@ config CACHE_MRC_SETTINGS
 	bool
 	default y
 
+config FSP_M_FILE
+	string "Intel FSP-M (memory init) binary path and filename"
+	depends on ADD_FSP_BINARIES
+	help
+	  The path and filename of the Intel FSP-M binary for this platform.
+
+config FSP_S_FILE
+	string "Intel FSP-S (silicon init) binary path and filename"
+	depends on ADD_FSP_BINARIES
+	help
+	  The path and filename of the Intel FSP-S binary for this platform.
+
+config VBT_FILE
+	string "VBT binary path and filename"
+	depends on ADD_VBT_DATA_FILE
+	help
+	  The path and filename of the VBT binary for this platform.
+
+config ADD_FSP_BINARIES
+	bool "Add Intel FSP 2.0 binaries to CBFS"
+	help
+	  Add the FSP-M and FSP-S binaries to CBFS. Note that coreboot does not
+	  use the FSP-T binary, so that will not be included.
+
+config ADD_VBT_DATA_FILE
+	bool "Add a Video Bios Table (VBT) binary to CBFS"
+	help
+	  Add a VBT file data file to CBFS. The VBT describes the integrated
+	  GPU and connections, and is needed by FSP in order to initialize the
+	  display.
+
 endif
diff --git a/src/soc/intel/apollolake/Makefile.inc b/src/soc/intel/apollolake/Makefile.inc
index 5cc4f26..e7a9d2c 100644
--- a/src/soc/intel/apollolake/Makefile.inc
+++ b/src/soc/intel/apollolake/Makefile.inc
@@ -59,4 +59,16 @@ postcar-y += tsc_freq.c
 
 CPPFLAGS_common += -I$(src)/soc/intel/apollolake/include
 
+cbfs-files-$(CONFIG_ADD_FSP_BINARIES) += blobs/fspm.bin
+blobs/fspm.bin-file := $(call strip_quotes,$(CONFIG_FSP_M_FILE))
+blobs/fspm.bin-type := raw
+
+cbfs-files-$(CONFIG_ADD_FSP_BINARIES) += blobs/fsps.bin
+blobs/fsps.bin-file := $(call strip_quotes,$(CONFIG_FSP_S_FILE))
+blobs/fsps.bin-type := raw
+
+cbfs-files-$(CONFIG_ADD_VBT_DATA_FILE) += vbt.bin
+vbt.bin-file := $(call strip_quotes,$(CONFIG_VBT_FILE))
+vbt.bin-type := raw
+
 endif