summaryrefslogtreecommitdiff
path: root/src/drivers/intel/gma
diff options
context:
space:
mode:
authorMatt DeVillier <matt.devillier@gmail.com>2022-02-09 10:27:09 -0600
committerMartin Roth <martinroth@google.com>2022-02-10 21:23:48 +0000
commitb8a23013c5952bcde1201d1e1181a965380dc12a (patch)
treee10b66c674dae138dc02b157d1e9b7e5ee0d71ad /src/drivers/intel/gma
parentcfc594cddd39b5152ea3688388e0ec392f1881e9 (diff)
drivers/intel/gma: Guard add_vbt_to_cbfs macro
Guard macro via CONFIG_INTEL_GMA_ADD_VBT, rather than guarding each of the calls to it (most of which are currently unguarded). Test: build google/coral w/ and w/o CONFIG_INTEL_GMA_ADD_VBT selected, verify VBTs added (or not) to CBFS based on Kconfig selection. Change-Id: Ic25554cb2c61b81bdb4b0987094c3558e0bbcbd8 Signed-off-by: Matt DeVillier <matt.devillier@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/61768 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Nico Huber <nico.h@gmx.de>
Diffstat (limited to 'src/drivers/intel/gma')
-rw-r--r--src/drivers/intel/gma/Makefile.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/drivers/intel/gma/Makefile.inc b/src/drivers/intel/gma/Makefile.inc
index 964d13e30c..5588e5af7b 100644
--- a/src/drivers/intel/gma/Makefile.inc
+++ b/src/drivers/intel/gma/Makefile.inc
@@ -8,6 +8,7 @@ endif
ramstage-$(CONFIG_INTEL_GMA_ACPI) += acpi.c
ramstage-$(CONFIG_INTEL_GMA_ACPI) += opregion.c
+ifeq ($(CONFIG_INTEL_GMA_ADD_VBT),y)
# add_vbt_to_cbfs, first argument is the filename in cbfs, the second one
# is the filename in the coreboot tree.
add_vbt_to_cbfs= \
@@ -15,10 +16,9 @@ add_vbt_to_cbfs= \
$(eval $1-file := $2) \
$(eval $1-type := raw) \
$(eval $1-compression := lzma)
+endif
-ifeq ($(CONFIG_INTEL_GMA_ADD_VBT),y)
$(call add_vbt_to_cbfs, vbt.bin, $(call strip_quotes,$(CONFIG_INTEL_GMA_VBT_FILE)))
-endif
ifeq ($(CONFIG_GFX_GMA),y)