diff options
| author | Wim Vervoorn <wvervoorn@eltan.com> | 2019-11-01 12:43:58 +0100 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2019-11-05 15:04:54 +0000 |
| commit | 8fc523e3137cfdde970a3c87e22b8bbc586a3f7e (patch) | |
| tree | 2a230957a4c60bb810300d0836ee80c739208d40 /src/soc/intel | |
| parent | 1058dd84f06fa2fcbdd99eb99da07dccdf5b9722 (diff) | |
drivers/intel/fsp2_0: Use strip_quotes for cbfs filenames
The quotes were not stripped for the cbfs filenames of the FSP
components. This is causing problems when the regions-for-file macro is
executed (when VBOOT is enabled and the files should be filtered).
BUG=N/A
TEST=build
Change-Id: I14267502cfab5308d3874a0c0fd18a71b08bb9f8
Signed-off-by: Wim Vervoorn <wvervoorn@eltan.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/36548
Reviewed-by: Frans Hendriks <fhendriks@eltan.com>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/soc/intel')
| -rw-r--r-- | src/soc/intel/apollolake/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/soc/intel/denverton_ns/Makefile.inc | 6 | ||||
| -rw-r--r-- | src/soc/intel/quark/Makefile.inc | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/soc/intel/apollolake/Makefile.inc b/src/soc/intel/apollolake/Makefile.inc index 7655d5aa9a..42cbab048f 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 -$(CONFIG_FSP_M_CBFS)-options := -b $(CONFIG_FSP_M_ADDR) +$(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 10bb665bd0..51ae1369c5 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 -$(CONFIG_FSP_T_CBFS)-options := -b $(CONFIG_FSP_T_ADDR) --xip -$(CONFIG_FSP_M_CBFS)-options := -b $(CONFIG_FSP_M_ADDR) --xip -$(CONFIG_FSP_S_CBFS)-options := -b $(CONFIG_FSP_S_ADDR) --xip +$(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 endif ## CONFIG_SOC_INTEL_DENVERTON_NS diff --git a/src/soc/intel/quark/Makefile.inc b/src/soc/intel/quark/Makefile.inc index 3a58cc9235..f2413c8805 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 -$(CONFIG_FSP_M_CBFS)-options := -b $(CONFIG_FSP_ESRAM_LOC) +$(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 |