[coreboot-gerrit] Patch set updated for coreboot: drivers/intel/fsp2_0: Add recipes for FSP blobs

[Andrey Petrov (andrey.petrov@intel.com)]

Andrey Petrov (andrey.petrov at intel.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14802

-gerrit

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

    drivers/intel/fsp2_0: Add recipes for FSP blobs
    
    Add Kconfig options and Makefile recipes that include FSP
    blobs in CBFS. Currently files are added as 'raw' type
    because blobs miss relocation information.
    
    Change-Id: I678a3541e51e5fb3515f7038484bc27890a16f1d
    Signed-off-by: Andrey Petrov <andrey.petrov at intel.com>
---
 src/drivers/intel/fsp2_0/Kconfig      | 18 ++++++++++++++++++
 src/drivers/intel/fsp2_0/Makefile.inc | 10 ++++++++++
 2 files changed, 28 insertions(+)

diff --git a/src/drivers/intel/fsp2_0/Kconfig b/src/drivers/intel/fsp2_0/Kconfig
index 9289f15..6cfacad 100644
--- a/src/drivers/intel/fsp2_0/Kconfig
+++ b/src/drivers/intel/fsp2_0/Kconfig
@@ -5,6 +5,12 @@ config PLATFORM_USES_FSP2_0
 
 if PLATFORM_USES_FSP2_0
 
+config ADD_FSP_BINARIES
+	bool "Add Intel FSP 2.0 binaries to CBFS"
+	help
+	  Add the FSP-M and FSP-S binaries to CBFS. Currently coreboot does not
+	  use the FSP-T binary and it is not added.
+
 config FSP_S_CBFS
 	string "Name of FSP-S in CBFS"
 	default "fsps.bin"
@@ -13,4 +19,16 @@ config FSP_M_CBFS
 	string "Name of FSP-M in CBFS"
 	default "fspm.bin"
 
+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.
+
 endif
diff --git a/src/drivers/intel/fsp2_0/Makefile.inc b/src/drivers/intel/fsp2_0/Makefile.inc
index 3e94f2f..33f77ea 100644
--- a/src/drivers/intel/fsp2_0/Makefile.inc
+++ b/src/drivers/intel/fsp2_0/Makefile.inc
@@ -25,4 +25,14 @@ ramstage-y += util.c
 
 CPPFLAGS_common += -I$(src)/drivers/intel/fsp2_0/include
 
+ifeq ($(CONFIG_ADD_FSP_BINARIES),y)
+cbfs-files-y += $(CONFIG_FSP_M_CBFS)
+$(CONFIG_FSP_M_CBFS)-file := $(call strip_quotes,$(CONFIG_FSP_M_FILE))
+$(CONFIG_FSP_M_CBFS)-type := raw
+
+cbfs-files-y += $(CONFIG_FSP_S_CBFS)
+$(CONFIG_FSP_S_CBFS)-file := $(call strip_quotes,$(CONFIG_FSP_S_FILE))
+$(CONFIG_FSP_S_CBFS)-type := raw
+endif
+
 endif