diff options
| author | Felix Held <felix.held@amd.corp-partner.google.com> | 2021-08-28 02:31:41 +0200 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2021-09-03 14:45:41 +0000 |
| commit | 2651d991332b3baaac0ff63f93710c7174affd4d (patch) | |
| tree | 1b5d47ebc6222b9cf2be7276cbf1e2c56fb03506 | |
| parent | e895b2aa9dc42084ad26456b3ba472bec964a92b (diff) | |
drivers/intel/fsp2_0/Makefile: add condition for FSP-T CBFS file
Make adding the FSP-T file to CBFS depend on both ADD_FSP_BINARIES and
FSP_CAR Kconfig options being set. The FSP_T_FILE Kconfig option depends
on both, so also check if both are selected in the Makefile where it
tries to add the FSP-T to the CBFS.
Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Suggested-by: Furquan Shaikh <furquan@google.com>
Change-Id: Id347336f2751c6d871f31d89c30a1222037c2d69
Reviewed-on: https://review.coreboot.org/c/coreboot/+/57220
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
| -rw-r--r-- | src/drivers/intel/fsp2_0/Makefile.inc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/drivers/intel/fsp2_0/Makefile.inc b/src/drivers/intel/fsp2_0/Makefile.inc index 3bbc7223a0..b472721550 100644 --- a/src/drivers/intel/fsp2_0/Makefile.inc +++ b/src/drivers/intel/fsp2_0/Makefile.inc @@ -43,13 +43,15 @@ 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) += $(FSP_T_CBFS) +ifeq ($(CONFIG_ADD_FSP_BINARIES)$(CONFIG_FSP_CAR),yy) +cbfs-files-y += $(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) $(FSP_T_CBFS)-options := --xip $(TXTIBB) $(FSP_T_CBFS)-position = $(CONFIG_FSP_T_LOCATION) -endif +endif # CONFIG_FSP_T_XIP +endif # CONFIG_ADD_FSP_BINARIES && CONFIG_FSP_CAR cbfs-files-$(CONFIG_ADD_FSP_BINARIES) += $(FSP_M_CBFS) $(FSP_M_CBFS)-file := $(call strip_quotes,$(CONFIG_FSP_M_FILE)) |