[coreboot-gerrit] Change in coreboot[master]: drivers/intel/gma: Include mainboard data.vbt

Arthur Heymans (Code Review) gerrit at coreboot.org
Mon May 28 21:11:57 CEST 2018


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


Change subject: drivers/intel/gma: Include mainboard data.vbt
......................................................................

drivers/intel/gma: Include mainboard data.vbt

This adds a INTEL_GMA_VBT_HAVE_SOURCE_FILE Kconfig option for the path
to point to the mainboard dir and to select
INTEL_GMA_ADD_VBT_DATA_FILE by default.

Change-Id: I730cb0737945631e2d5379a9e26b8c039ec6dc49
Signed-off-by: Arthur Heymans <arthur at aheymans.xyz>
---
M src/device/Kconfig
M src/drivers/intel/gma/Kconfig
M src/mainboard/lenovo/t420/Kconfig
M src/mainboard/lenovo/t420s/Kconfig
M src/mainboard/lenovo/t430/Kconfig
M src/mainboard/lenovo/t430s/Kconfig
M src/mainboard/lenovo/t520/Kconfig
M src/mainboard/lenovo/t530/Kconfig
M src/mainboard/lenovo/x220/Kconfig
M src/mainboard/lenovo/x230/Kconfig
10 files changed, 15 insertions(+), 0 deletions(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/53/26653/1

diff --git a/src/device/Kconfig b/src/device/Kconfig
index a36b2e1..dc6d3a0 100644
--- a/src/device/Kconfig
+++ b/src/device/Kconfig
@@ -601,6 +601,7 @@
 config INTEL_GMA_ADD_VBT_DATA_FILE
 	depends on SOC_INTEL_COMMON || CPU_INTEL_COMMON
 	bool "Add a Video Bios Table (VBT) binary to CBFS"
+	default y if INTEL_GMA_VBT_HAVE_SOURCE_FILE
 	help
 	  Add a VBT data file to CBFS. The VBT describes the integrated
 	  GPU and connections, and is needed by the GOP driver integrated into
@@ -609,6 +610,7 @@
 config INTEL_GMA_VBT_FILE
 	string "VBT binary path and filename"
 	depends on INTEL_GMA_ADD_VBT_DATA_FILE
+	default "src/mainboard/$(MAINBOARDDIR)/$(VARIANTDIR)/data.vbt" if INTEL_GMA_VBT_HAVE_SOURCE_FILE
 	default "3rdparty/blobs/mainboard/$(MAINBOARDDIR)/vbt.bin"
 	help
 	  The path and filename of the VBT binary.
diff --git a/src/drivers/intel/gma/Kconfig b/src/drivers/intel/gma/Kconfig
index 9e2872b..aa10914 100644
--- a/src/drivers/intel/gma/Kconfig
+++ b/src/drivers/intel/gma/Kconfig
@@ -13,6 +13,11 @@
 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ## GNU General Public License for more details.
 ##
+config INTEL_GMA_VBT_HAVE_SOURCE_FILE
+	bool
+	help
+	  Select this in the mainboard Kconfig to indicate the board has
+	  a data.vbt file.
 
 config INTEL_DDI
 	bool
diff --git a/src/mainboard/lenovo/t420/Kconfig b/src/mainboard/lenovo/t420/Kconfig
index c0b4752..c172fe1 100644
--- a/src/mainboard/lenovo/t420/Kconfig
+++ b/src/mainboard/lenovo/t420/Kconfig
@@ -23,6 +23,7 @@
 	select MAINBOARD_HAS_LIBGFXINIT
 	select GFX_GMA_INTERNAL_IS_LVDS
 	select DRIVERS_LENOVO_HYBRID_GRAPHICS
+	select INTEL_GMA_VBT_HAVE_SOURCE_FILE
 
 	# Workaround for EC/KBC IRQ1.
 	select SERIRQ_CONTINUOUS_MODE
diff --git a/src/mainboard/lenovo/t420s/Kconfig b/src/mainboard/lenovo/t420s/Kconfig
index 08052b1..2d63393 100644
--- a/src/mainboard/lenovo/t420s/Kconfig
+++ b/src/mainboard/lenovo/t420s/Kconfig
@@ -19,6 +19,7 @@
 	select SANDYBRIDGE_IVYBRIDGE_LVDS
 	select MAINBOARD_HAS_LPC_TPM
 	select DRIVERS_LENOVO_HYBRID_GRAPHICS
+	select INTEL_GMA_VBT_HAVE_SOURCE_FILE
 
 	# Workaround for EC/KBC IRQ1.
 	select SERIRQ_CONTINUOUS_MODE
diff --git a/src/mainboard/lenovo/t430/Kconfig b/src/mainboard/lenovo/t430/Kconfig
index a621fdb..de3f097 100644
--- a/src/mainboard/lenovo/t430/Kconfig
+++ b/src/mainboard/lenovo/t430/Kconfig
@@ -24,6 +24,7 @@
 	select DRIVERS_LENOVO_HYBRID_GRAPHICS
 	select MAINBOARD_HAS_LIBGFXINIT
 	select GFX_GMA_INTERNAL_IS_LVDS
+	select INTEL_GMA_VBT_HAVE_SOURCE_FILE
 
 config HAVE_IFD_BIN
 	bool
diff --git a/src/mainboard/lenovo/t430s/Kconfig b/src/mainboard/lenovo/t430s/Kconfig
index f45fb0d..72508b4 100644
--- a/src/mainboard/lenovo/t430s/Kconfig
+++ b/src/mainboard/lenovo/t430s/Kconfig
@@ -21,6 +21,7 @@
 	select MAINBOARD_HAS_LPC_TPM
 	select MAINBOARD_HAS_LIBGFXINIT
 	select GFX_GMA_INTERNAL_IS_LVDS
+	select INTEL_GMA_VBT_HAVE_SOURCE_FILE
 
 	# Workaround for EC/KBC IRQ1.
 	select SERIRQ_CONTINUOUS_MODE
diff --git a/src/mainboard/lenovo/t520/Kconfig b/src/mainboard/lenovo/t520/Kconfig
index 2adfa33..fcc1142 100644
--- a/src/mainboard/lenovo/t520/Kconfig
+++ b/src/mainboard/lenovo/t520/Kconfig
@@ -17,6 +17,7 @@
 	select SANDYBRIDGE_IVYBRIDGE_LVDS
 	select MAINBOARD_HAS_LPC_TPM
 	select DRIVERS_LENOVO_HYBRID_GRAPHICS
+	select INTEL_GMA_VBT_HAVE_SOURCE_FILE if BOARD_LENOVO_BASEBOARD_T520
 
 	# Workaround for EC/KBC IRQ1.
 	select SERIRQ_CONTINUOUS_MODE
diff --git a/src/mainboard/lenovo/t530/Kconfig b/src/mainboard/lenovo/t530/Kconfig
index 065fd3c..d1da01f 100644
--- a/src/mainboard/lenovo/t530/Kconfig
+++ b/src/mainboard/lenovo/t530/Kconfig
@@ -20,6 +20,7 @@
 	select ENABLE_VMX
 	select MAINBOARD_HAS_LPC_TPM
 	select DRIVERS_LENOVO_HYBRID_GRAPHICS
+	select INTEL_GMA_VBT_HAVE_SOURCE_FILE
 
 	# Workaround for EC/KBC IRQ1.
 	select SERIRQ_CONTINUOUS_MODE
diff --git a/src/mainboard/lenovo/x220/Kconfig b/src/mainboard/lenovo/x220/Kconfig
index 73fb860..339e28c 100644
--- a/src/mainboard/lenovo/x220/Kconfig
+++ b/src/mainboard/lenovo/x220/Kconfig
@@ -20,6 +20,7 @@
 	select MAINBOARD_HAS_LPC_TPM
 	select MAINBOARD_HAS_LIBGFXINIT
 	select GFX_GMA_INTERNAL_IS_LVDS
+	select INTEL_GMA_VBT_HAVE_SOURCE_FILE
 
 	# Workaround for EC/KBC IRQ1.
 	select SERIRQ_CONTINUOUS_MODE
diff --git a/src/mainboard/lenovo/x230/Kconfig b/src/mainboard/lenovo/x230/Kconfig
index 39af0e3..a42ba48 100644
--- a/src/mainboard/lenovo/x230/Kconfig
+++ b/src/mainboard/lenovo/x230/Kconfig
@@ -21,6 +21,7 @@
 	select MAINBOARD_HAS_LPC_TPM
 	select MAINBOARD_HAS_LIBGFXINIT
 	select GFX_GMA_INTERNAL_IS_LVDS
+	select INTEL_GMA_VBT_HAVE_SOURCE_FILE
 
 	# Workaround for EC/KBC IRQ1.
 	select SERIRQ_CONTINUOUS_MODE

-- 
To view, visit https://review.coreboot.org/26653
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: I730cb0737945631e2d5379a9e26b8c039ec6dc49
Gerrit-Change-Number: 26653
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/20180528/0aeb7d48/attachment.html>


More information about the coreboot-gerrit mailing list