summaryrefslogtreecommitdiff
path: root/src/soc
diff options
context:
space:
mode:
authorMario Scheithauer <mario.scheithauer@siemens.com>2019-11-06 11:01:00 +0100
committerPatrick Georgi <pgeorgi@google.com>2019-11-07 14:14:20 +0000
commit4e074033de11eebeb0f341f6d7a91eaab27f68ab (patch)
tree36a96df9a1444277cbb1d33f8a97fb961d6beb04 /src/soc
parent1b1a26acdc814d0478bb5fda0b6664076a60fdf1 (diff)
downloadcoreboot-4e074033de11eebeb0f341f6d7a91eaab27f68ab.tar.xz
soc/intel/{apl,dnv,quark}: Use strip_quotes for FSP options
The commit 8fc523e3 (drivers/intel/fsp2_0: Use strip_quotes for cbfs filenames) breaks the Siemens APL mainboards as FSP-M never returns once it is called. The reason for this is that the -b option is missing when adding the FSP package to cbfs via cbfstool. This patch fixes this issue. TEST=tested on siemens/mc_apl5 Change-Id: I48e5fa36e1ad799d09714f53a3041f73b8ec3550 Signed-off-by: Mario Scheithauer <mario.scheithauer@siemens.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/36645 Reviewed-by: Subrata Banik <subrata.banik@intel.com> Reviewed-by: David Guckian Reviewed-by: Patrick Georgi <pgeorgi@google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/soc')
-rw-r--r--src/soc/intel/apollolake/Makefile.inc2
-rw-r--r--src/soc/intel/denverton_ns/Makefile.inc6
-rw-r--r--src/soc/intel/quark/Makefile.inc2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/soc/intel/apollolake/Makefile.inc b/src/soc/intel/apollolake/Makefile.inc
index 42cbab048f..ef81e32abd 100644
--- a/src/soc/intel/apollolake/Makefile.inc
+++ b/src/soc/intel/apollolake/Makefile.inc
@@ -108,7 +108,7 @@ endif
CPPFLAGS_common += -I$(src)/soc/intel/apollolake/include
# Since FSP-M runs in CAR we need to relocate it to a specific address
-$(FSP_M_CBFS)-options := -b $(CONFIG_FSP_M_ADDR)
+$(call strip_quotes,$(CONFIG_FSP_M_CBFS))-options := -b $(CONFIG_FSP_M_ADDR)
# Handle GLK paging requirements
ifeq ($(CONFIG_PAGING_IN_CACHE_AS_RAM),y)
diff --git a/src/soc/intel/denverton_ns/Makefile.inc b/src/soc/intel/denverton_ns/Makefile.inc
index 51ae1369c5..4050f61811 100644
--- a/src/soc/intel/denverton_ns/Makefile.inc
+++ b/src/soc/intel/denverton_ns/Makefile.inc
@@ -90,8 +90,8 @@ CPPFLAGS_common += -I$(src)/vendorcode/intel/fsp/fsp2_0/denverton_ns
##Set FSP binary blobs memory location
-$(FSP_T_CBFS)-options := -b $(CONFIG_FSP_T_ADDR) --xip
-$(FSP_M_CBFS)-options := -b $(CONFIG_FSP_M_ADDR) --xip
-$(FSP_S_CBFS)-options := -b $(CONFIG_FSP_S_ADDR) --xip
+$(call strip_quotes,$(CONFIG_FSP_T_CBFS))-options := -b $(CONFIG_FSP_T_ADDR) --xip
+$(call strip_quotes,$(CONFIG_FSP_M_CBFS))-options := -b $(CONFIG_FSP_M_ADDR) --xip
+$(call strip_quotes,$(CONFIG_FSP_S_CBFS))-options := -b $(CONFIG_FSP_S_ADDR) --xip
endif ## CONFIG_SOC_INTEL_DENVERTON_NS
diff --git a/src/soc/intel/quark/Makefile.inc b/src/soc/intel/quark/Makefile.inc
index f2413c8805..bd120abc9f 100644
--- a/src/soc/intel/quark/Makefile.inc
+++ b/src/soc/intel/quark/Makefile.inc
@@ -71,7 +71,7 @@ CPPFLAGS_common += -I$(src)/soc/intel/quark/include/soc/fsp
CPPFLAGS_common += -I3rdparty/blobs/soc/intel/quark
# Since FSP-M runs in CAR we need to relocate it to a specific address
-$(FSP_M_CBFS)-options := -b $(CONFIG_FSP_ESRAM_LOC)
+$(call strip_quotes,$(CONFIG_FSP_M_CBFS))-options := -b $(CONFIG_FSP_ESRAM_LOC)
# Add the FSP binary to the CBFS image
cbfs-files-$(CONFIG_ADD_FSP_RAW_BIN) += fsp.bin