From 54f857b29e7d7fddf4ad2c13a16f624e25349456 Mon Sep 17 00:00:00 2001 From: Lee Leahy Date: Wed, 28 Sep 2016 18:03:13 -0700 Subject: soc/intel/quark: Support multiple version of FSP Add support for multiple versions of FSP. BRANCH=none BUG=None TEST=Build FSP 1.1 (SEC/PEI core, with all FSP debug off) and run on Galileo Gen2 Change-Id: Ie7e7f0f883c4d3bfcb18fa25571e505cdde00b2d Signed-off-by: Lee Leahy Reviewed-on: https://review.coreboot.org/16807 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth --- src/soc/intel/quark/Kconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/soc/intel/quark') diff --git a/src/soc/intel/quark/Kconfig b/src/soc/intel/quark/Kconfig index 3950d43f3f..33b3cf8d97 100644 --- a/src/soc/intel/quark/Kconfig +++ b/src/soc/intel/quark/Kconfig @@ -178,7 +178,7 @@ config ADD_FSP_RAW_BIN config FSP_FILE string "Intel FSP binary path and filename" - default "3rdparty/blobs/soc/intel/quark/fsp.bin" + default "3rdparty/blobs/soc/intel/quark/$(CONFIG_FSP_TYPE)/$(CONFIG_FSP_BUILD_TYPE)/FSP.fd" depends on PLATFORM_USES_FSP1_1 depends on ADD_FSP_RAW_BIN help @@ -218,12 +218,12 @@ config RELOCATE_FSP_INTO_DRAM config FSP_M_FILE string depends on PLATFORM_USES_FSP2_0 - default "3rdparty/blobs/soc/intel/quark/FSP_M.fd" + default "3rdparty/blobs/soc/intel/quark/$(CONFIG_FSP_TYPE)/$(CONFIG_FSP_BUILD_TYPE)/FSP_M.fd" config FSP_S_FILE string depends on PLATFORM_USES_FSP2_0 - default "3rdparty/blobs/soc/intel/quark/FSP_S.fd" + default "3rdparty/blobs/soc/intel/quark/$(CONFIG_FSP_TYPE)/$(CONFIG_FSP_BUILD_TYPE)/FSP_S.fd" ##### # RMU binary -- cgit v1.2.3