[coreboot-gerrit] Patch set updated for coreboot: mainboard/intel/galileo: Split out enabling FSP1_1

[Leroy P Leahy (leroy.p.leahy@intel.com)]

Leroy P Leahy (leroy.p.leahy at intel.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15001

-gerrit

commit d9df27a107f06a790b9b3648ed999d7a0cef35df
Author: Lee Leahy <leroy.p.leahy at intel.com>
Date:   Sat May 28 14:58:57 2016 -0700

    mainboard/intel/galileo: Split out enabling FSP1_1
    
    Split out enabling FSP 1.1 support to prepare for enabling FSP 2.0
    support.
    
    TEST=Build and run on Galileo Gen2.
    
    Change-Id: Ic4e814bcf61f9480f98e2d7bc7a1648dec43a07d
    Signed-off-by: Lee Leahy <leroy.p.leahy at intel.com>
---
 src/mainboard/intel/galileo/Kconfig      | 7 ++++++-
 src/mainboard/intel/galileo/Makefile.inc | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/mainboard/intel/galileo/Kconfig b/src/mainboard/intel/galileo/Kconfig
index 6381ae8..4191ab7 100644
--- a/src/mainboard/intel/galileo/Kconfig
+++ b/src/mainboard/intel/galileo/Kconfig
@@ -19,8 +19,8 @@ config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select BOARD_ROMSIZE_KB_8192
 	select HAVE_ACPI_TABLES
-	select PLATFORM_USES_FSP1_1
 	select SOC_INTEL_QUARK
+	select USE_FSP1_1
 
 config MAINBOARD_DIR
 	string
@@ -43,4 +43,9 @@ config GALILEO_GEN2
 	  runtime.  Select which generation of the Galileo that coreboot
 	  should initialize.
 
+config USE_FSP1_1
+	bool
+	default n
+	select PLATFORM_USES_FSP1_1
+
 endif # BOARD_INTEL_QUARK
diff --git a/src/mainboard/intel/galileo/Makefile.inc b/src/mainboard/intel/galileo/Makefile.inc
index 4db9e31..72c74e1 100644
--- a/src/mainboard/intel/galileo/Makefile.inc
+++ b/src/mainboard/intel/galileo/Makefile.inc
@@ -13,7 +13,9 @@
 ## GNU General Public License for more details.
 ##
 
+ifeq ($(CONFIG_PLATFORM_USES_FSP1_1),y)
 CPPFLAGS_common += -I$(src)/vendorcode/intel/fsp/fsp1_1/quark
+endif
 
 romstage-y += gpio.c