diff --git a/src/mainboard/intel/galileo/Kconfig b/src/mainboard/intel/galileo/Kconfig
index 6381ae82ba..4191ab715c 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 4db9e31943..72c74e1258 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