[coreboot-gerrit] Change in coreboot[master]: mb/*/*: Include data.vbt file by default

[Arthur Heymans (Code Review)]

Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/26273


Change subject: mb/*/*: Include data.vbt file by default
......................................................................

mb/*/*: Include data.vbt file by default

Include data.vbt files by default in cbfs and use the
INTEL_GMA_ADD_VBT_DATA_FILE as an override.

Change-Id: I871116ac0381644090b1e929cfac60699fd39641
Signed-off-by: Arthur Heymans <arthur at aheymans.xyz>
---
M src/device/Kconfig
M src/mainboard/lenovo/t420/Makefile.inc
M src/mainboard/lenovo/t420s/Makefile.inc
M src/mainboard/lenovo/t430/Makefile.inc
M src/mainboard/lenovo/t430s/Makefile.inc
M src/mainboard/lenovo/t520/Makefile.inc
M src/mainboard/lenovo/t530/Makefile.inc
M src/mainboard/lenovo/x220/Makefile.inc
M src/mainboard/lenovo/x230/Makefile.inc
9 files changed, 58 insertions(+), 0 deletions(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/73/26273/1

diff --git a/src/device/Kconfig b/src/device/Kconfig
index a36b2e1..f6143b2 100644
--- a/src/device/Kconfig
+++ b/src/device/Kconfig
@@ -605,6 +605,8 @@
 	  Add a VBT data file to CBFS. The VBT describes the integrated
 	  GPU and connections, and is needed by the GOP driver integrated into
 	  FSP and the OS driver in order to initialize the display.
+	  Some boards already have a VBT data file in their board directory.
+	  This option then provides to override that file.
 
 config INTEL_GMA_VBT_FILE
 	string "VBT binary path and filename"
diff --git a/src/mainboard/lenovo/t420/Makefile.inc b/src/mainboard/lenovo/t420/Makefile.inc
index 2dab950..8fb95f5 100644
--- a/src/mainboard/lenovo/t420/Makefile.inc
+++ b/src/mainboard/lenovo/t420/Makefile.inc
@@ -17,3 +17,10 @@
 romstage-y += gpio.c
 
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+
+ifneq ($(CONFIG_INTEL_GMA_ADD_VBT_DATA_FILE),y)
+cbfs-files-y += vbt.bin
+vbt.bin-file := data.vbt
+vbt.bin-type := raw
+vbt.bin-compression := lzma
+endif
diff --git a/src/mainboard/lenovo/t420s/Makefile.inc b/src/mainboard/lenovo/t420s/Makefile.inc
index 9eb141a..f3dafde 100644
--- a/src/mainboard/lenovo/t420s/Makefile.inc
+++ b/src/mainboard/lenovo/t420s/Makefile.inc
@@ -15,3 +15,10 @@
 
 smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
 romstage-y += gpio.c
+
+ifneq ($(CONFIG_INTEL_GMA_ADD_VBT_DATA_FILE),y)
+cbfs-files-y += vbt.bin
+vbt.bin-file := data.vbt
+vbt.bin-type := raw
+vbt.bin-compression := lzma
+endif
diff --git a/src/mainboard/lenovo/t430/Makefile.inc b/src/mainboard/lenovo/t430/Makefile.inc
index 794b5cd..460b013 100644
--- a/src/mainboard/lenovo/t430/Makefile.inc
+++ b/src/mainboard/lenovo/t430/Makefile.inc
@@ -4,3 +4,10 @@
 smm-y += smihandler.c
 
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+
+ifneq ($(CONFIG_INTEL_GMA_ADD_VBT_DATA_FILE),y)
+cbfs-files-y += vbt.bin
+vbt.bin-file := data.vbt
+vbt.bin-type := raw
+vbt.bin-compression := lzma
+endif
diff --git a/src/mainboard/lenovo/t430s/Makefile.inc b/src/mainboard/lenovo/t430s/Makefile.inc
index cb01f1c..4ce886f 100644
--- a/src/mainboard/lenovo/t430s/Makefile.inc
+++ b/src/mainboard/lenovo/t430s/Makefile.inc
@@ -16,3 +16,10 @@
 smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
 romstage-y += gpio.c
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+
+ifneq ($(CONFIG_INTEL_GMA_ADD_VBT_DATA_FILE),y)
+cbfs-files-y += vbt.bin
+vbt.bin-file := data.vbt
+vbt.bin-type := raw
+vbt.bin-compression := lzma
+endif
diff --git a/src/mainboard/lenovo/t520/Makefile.inc b/src/mainboard/lenovo/t520/Makefile.inc
index 5c450eb..cc1c7b0 100644
--- a/src/mainboard/lenovo/t520/Makefile.inc
+++ b/src/mainboard/lenovo/t520/Makefile.inc
@@ -16,3 +16,10 @@
 smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
 romstage-y += variants/$(VARIANT_DIR)/gpio.c
 romstage-y += variants/$(VARIANT_DIR)/romstage.c
+
+ifneq ($(CONFIG_INTEL_GMA_ADD_VBT_DATA_FILE),y)
+cbfs-files-y += vbt.bin
+vbt.bin-file := variants/$(VARIANT_DIR)/data.vbt
+vbt.bin-type := raw
+vbt.bin-compression := lzma
+endif
diff --git a/src/mainboard/lenovo/t530/Makefile.inc b/src/mainboard/lenovo/t530/Makefile.inc
index 9eb141a..f3dafde 100644
--- a/src/mainboard/lenovo/t530/Makefile.inc
+++ b/src/mainboard/lenovo/t530/Makefile.inc
@@ -15,3 +15,10 @@
 
 smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
 romstage-y += gpio.c
+
+ifneq ($(CONFIG_INTEL_GMA_ADD_VBT_DATA_FILE),y)
+cbfs-files-y += vbt.bin
+vbt.bin-file := data.vbt
+vbt.bin-type := raw
+vbt.bin-compression := lzma
+endif
diff --git a/src/mainboard/lenovo/x220/Makefile.inc b/src/mainboard/lenovo/x220/Makefile.inc
index 2dab950..8fb95f5 100644
--- a/src/mainboard/lenovo/x220/Makefile.inc
+++ b/src/mainboard/lenovo/x220/Makefile.inc
@@ -17,3 +17,10 @@
 romstage-y += gpio.c
 
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+
+ifneq ($(CONFIG_INTEL_GMA_ADD_VBT_DATA_FILE),y)
+cbfs-files-y += vbt.bin
+vbt.bin-file := data.vbt
+vbt.bin-type := raw
+vbt.bin-compression := lzma
+endif
diff --git a/src/mainboard/lenovo/x230/Makefile.inc b/src/mainboard/lenovo/x230/Makefile.inc
index 2dab950..8fb95f5 100644
--- a/src/mainboard/lenovo/x230/Makefile.inc
+++ b/src/mainboard/lenovo/x230/Makefile.inc
@@ -17,3 +17,10 @@
 romstage-y += gpio.c
 
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+
+ifneq ($(CONFIG_INTEL_GMA_ADD_VBT_DATA_FILE),y)
+cbfs-files-y += vbt.bin
+vbt.bin-file := data.vbt
+vbt.bin-type := raw
+vbt.bin-compression := lzma
+endif

-- 
To view, visit https://review.coreboot.org/26273
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I871116ac0381644090b1e929cfac60699fd39641
Gerrit-Change-Number: 26273
Gerrit-PatchSet: 1
Gerrit-Owner: Arthur Heymans <arthur at aheymans.xyz>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20180514/97919bb0/attachment.html>