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/drivers | |
| parent | 1058dd84f06fa2fcbdd99eb99da07dccdf5b9722 (diff) | |
| download | coreboot-8fc523e3137cfdde970a3c87e22b8bbc586a3f7e.tar.xz | |
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/drivers')
| -rw-r--r-- | src/drivers/intel/fsp2_0/Makefile.inc | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/src/drivers/intel/fsp2_0/Makefile.inc b/src/drivers/intel/fsp2_0/Makefile.inc index 8e69377789..806d8057ac 100644 --- a/src/drivers/intel/fsp2_0/Makefile.inc +++ b/src/drivers/intel/fsp2_0/Makefile.inc @@ -42,25 +42,29 @@ postcar-y += hand_off_block.c CPPFLAGS_common += -I$(src)/drivers/intel/fsp2_0/include +FSP_T_CBFS = $(call strip_quotes,$(CONFIG_FSP_T_CBFS)) +FSP_M_CBFS = $(call strip_quotes,$(CONFIG_FSP_M_CBFS)) +FSP_S_CBFS = $(call strip_quotes,$(CONFIG_FSP_S_CBFS)) + # Add FSP blobs into cbfs. SoC code may supply additional options with # -options, e.g --xip or -b -cbfs-files-$(CONFIG_FSP_CAR) += $(CONFIG_FSP_T_CBFS) -$(CONFIG_FSP_T_CBFS)-file := $(call strip_quotes,$(CONFIG_FSP_T_FILE)) -$(CONFIG_FSP_T_CBFS)-type := fsp +cbfs-files-$(CONFIG_FSP_CAR) += $(FSP_T_CBFS) +$(FSP_T_CBFS)-file := $(call strip_quotes,$(CONFIG_FSP_T_FILE)) +$(FSP_T_CBFS)-type := fsp ifeq ($(CONFIG_FSP_T_XIP),y) -$(CONFIG_FSP_T_CBFS)-options := --xip $(TXTIBB) +$(FSP_T_CBFS)-options := --xip $(TXTIBB) endif -cbfs-files-$(CONFIG_ADD_FSP_BINARIES) += $(CONFIG_FSP_M_CBFS) -$(CONFIG_FSP_M_CBFS)-file := $(call strip_quotes,$(CONFIG_FSP_M_FILE)) -$(CONFIG_FSP_M_CBFS)-type := fsp +cbfs-files-$(CONFIG_ADD_FSP_BINARIES) += $(FSP_M_CBFS) +$(FSP_M_CBFS)-file := $(call strip_quotes,$(CONFIG_FSP_M_FILE)) +$(FSP_M_CBFS)-type := fsp ifeq ($(CONFIG_FSP_M_XIP),y) -$(CONFIG_FSP_M_CBFS)-options := --xip $(TXTIBB) +$(FSP_M_CBFS)-options := --xip $(TXTIBB) endif -cbfs-files-$(CONFIG_ADD_FSP_BINARIES) += $(CONFIG_FSP_S_CBFS) -$(CONFIG_FSP_S_CBFS)-file := $(call strip_quotes,$(CONFIG_FSP_S_FILE)) -$(CONFIG_FSP_S_CBFS)-type := fsp +cbfs-files-$(CONFIG_ADD_FSP_BINARIES) += $(FSP_S_CBFS) +$(FSP_S_CBFS)-file := $(call strip_quotes,$(CONFIG_FSP_S_FILE)) +$(FSP_S_CBFS)-type := fsp ifeq ($(CONFIG_FSP_USE_REPO),y) $(obj)/Fsp_M.fd: $(call strip_quotes,$(CONFIG_FSP_FD_PATH)) |