From 322f76dfbf1e7254f15daff91d31ae85b888e249 Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Tue, 25 Dec 2018 18:43:18 +0100 Subject: [PATCH] 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 Reviewed-on: https://review.coreboot.org/c/30430 Reviewed-by: Tristan Corrick Reviewed-by: Patrick Rudolph Tested-by: build bot (Jenkins) --- src/drivers/intel/gma/Makefile.inc | 15 +++++++++++---- src/mainboard/lenovo/x200/Makefile.inc | 6 ------ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/drivers/intel/gma/Makefile.inc b/src/drivers/intel/gma/Makefile.inc index 30b3749979..274955aa2f 100644 --- a/src/drivers/intel/gma/Makefile.inc +++ b/src/drivers/intel/gma/Makefile.inc @@ -21,10 +21,17 @@ endif 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 tree. +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 5e9832dcce..ffd7cf22d1 100644 --- a/src/mainboard/lenovo/x200/Makefile.inc +++ b/src/mainboard/lenovo/x200/Makefile.inc @@ -20,11 +20,5 @@ romstage-y += gpio.c 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)