Change in ...coreboot[master]: intel/gma/Makefile.inc: Add a helper function to add VBT binaries

[Arthur Heymans (Code Review)]

Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/30430

Change subject: intel/gma/Makefile.inc: Add a helper function to add VBT binaries
......................................................................

intel/gma/Makefile.inc: Add a helper function to add VBT binaries

This adds a convenient helper function to add vbt binaries to cbfs.

Change-Id: I80d9b3421f6e539879ad4802119fe81d7ea1e234
Signed-off-by: Arthur Heymans 
---
M src/drivers/intel/gma/Makefile.inc
M src/mainboard/lenovo/x200/Makefile.inc
2 files changed, 11 insertions(+), 10 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/30/30430/1

diff --git a/src/drivers/intel/gma/Makefile.inc b/src/drivers/intel/gma/Makefile.inc
index 30b3749..69cf58b 100644
--- a/src/drivers/intel/gma/Makefile.inc
+++ b/src/drivers/intel/gma/Makefile.inc
@@ -21,10 +21,17 @@
 ramstage-$(CONFIG_INTEL_GMA_ACPI) += acpi.c
 ramstage-$(CONFIG_INTEL_GMA_ACPI) += opregion.c

-cbfs-files-$(CONFIG_INTEL_GMA_ADD_VBT) += vbt.bin
-vbt.bin-file := $(call strip_quotes,$(CONFIG_INTEL_GMA_VBT_FILE))
-vbt.bin-type := raw
-vbt.bin-compression := lzma
+# add_vbt_to_cbfs, first argument is the filename in cbfs, the second one
+# is the filename in the coreboot three.
+add_vbt_to_cbfs= \
+	$(eval cbfs-files-y += $1) \
+	$(eval $1-file := $2) \
+	$(eval $1-type := raw) \
+	$(eval $1-compression := lzma)
+
+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_MAINBOARD_USE_LIBGFXINIT),y)

diff --git a/src/mainboard/lenovo/x200/Makefile.inc b/src/mainboard/lenovo/x200/Makefile.inc
index 5e9832d..ffd7cf2 100644
--- a/src/mainboard/lenovo/x200/Makefile.inc
+++ b/src/mainboard/lenovo/x200/Makefile.inc
@@ -20,11 +20,5 @@

ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads

-add_vbt_to_cbfs= \
-	$(eval cbfs-files-y += $1) \
-	$(eval $1-file := $2) \
-	$(eval $1-type := raw) \
-        $(eval $1-compression := lzma)
-
 $(call add_vbt_to_cbfs, data_ccfl.vbt, data_ccfl.vbt)
 $(call add_vbt_to_cbfs, data_led.vbt, data_led.vbt)