<p>Nico Huber has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/26898">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">[RFC] drivers/intel/gma: Unify VBT related Kconfig names<br><br>Shuffle words and drop the _DATA_FILE suffix.<br><br>Change-Id: I0b0d50ea729e5580c0bc7b43f250ff387ce59cfc<br>Signed-off-by: Nico Huber <nico.h@gmx.de><br>---<br>M src/device/Kconfig<br>M src/drivers/intel/fsp1_1/Kconfig<br>M src/drivers/intel/fsp1_1/Makefile.inc<br>M src/drivers/intel/gma/Makefile.inc<br>M src/mainboard/asrock/g41c-gs/Kconfig<br>M src/mainboard/asus/p5gc-mx/Kconfig<br>M src/mainboard/foxconn/g41s-k/Kconfig<br>M src/mainboard/gigabyte/ga-945gcm-s2l/Kconfig<br>M src/mainboard/gigabyte/ga-g41m-es2l/Kconfig<br>M src/mainboard/intel/d945gclf/Kconfig<br>M src/mainboard/intel/dg41wv/Kconfig<br>M src/mainboard/intel/dg43gt/Kconfig<br>M src/mainboard/lenovo/t420/Kconfig<br>M src/mainboard/lenovo/t420s/Kconfig<br>M src/mainboard/lenovo/t430/Kconfig<br>M src/mainboard/lenovo/t430s/Kconfig<br>M src/mainboard/lenovo/t520/Kconfig<br>M src/mainboard/lenovo/t530/Kconfig<br>M src/mainboard/lenovo/t60/Kconfig<br>M src/mainboard/lenovo/x220/Kconfig<br>M src/mainboard/lenovo/x230/Kconfig<br>M src/mainboard/lenovo/x60/Kconfig<br>M src/soc/intel/apollolake/Kconfig<br>M src/soc/intel/braswell/acpi.c<br>M src/soc/intel/cannonlake/Kconfig<br>M src/soc/intel/cannonlake/graphics.c<br>M src/soc/intel/skylake/Kconfig<br>M src/soc/intel/skylake/graphics.c<br>28 files changed, 34 insertions(+), 34 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/98/26898/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/device/Kconfig b/src/device/Kconfig</span><br><span>index 1ed9b1b..016e104 100644</span><br><span>--- a/src/device/Kconfig</span><br><span>+++ b/src/device/Kconfig</span><br><span>@@ -598,16 +598,16 @@</span><br><span> </span><br><span> Under GNU/Linux you can run `lspci -nn` to list the IDs of your PCI devices.</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-config INTEL_GMA_VBT_HAVE_DATA_FILE</span><br><span style="color: hsl(120, 100%, 40%);">+config INTEL_GMA_HAVE_VBT</span><br><span> bool</span><br><span> help</span><br><span> Select this in the mainboard Kconfig to indicate the board has</span><br><span> a data.vbt file.</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-config INTEL_GMA_ADD_VBT_DATA_FILE</span><br><span style="color: hsl(120, 100%, 40%);">+config INTEL_GMA_ADD_VBT</span><br><span> depends on SOC_INTEL_COMMON || CPU_INTEL_COMMON</span><br><span> bool "Add a Video Bios Table (VBT) binary to CBFS"</span><br><span style="color: hsl(0, 100%, 40%);">- default y if INTEL_GMA_VBT_HAVE_DATA_FILE</span><br><span style="color: hsl(120, 100%, 40%);">+ default y if INTEL_GMA_HAVE_VBT</span><br><span> help</span><br><span> Add a VBT data file to CBFS. The VBT describes the integrated</span><br><span> GPU and connections, and is needed by the GOP driver integrated into</span><br><span>@@ -615,10 +615,10 @@</span><br><span> </span><br><span> config INTEL_GMA_VBT_FILE</span><br><span> string "VBT binary path and filename"</span><br><span style="color: hsl(0, 100%, 40%);">- depends on INTEL_GMA_ADD_VBT_DATA_FILE</span><br><span style="color: hsl(120, 100%, 40%);">+ depends on INTEL_GMA_ADD_VBT</span><br><span> default "src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt" \</span><br><span style="color: hsl(0, 100%, 40%);">- if INTEL_GMA_VBT_HAVE_DATA_FILE && VARIANT_DIR != ""</span><br><span style="color: hsl(0, 100%, 40%);">- default "src/mainboard/$(MAINBOARDDIR)/data.vbt" if INTEL_GMA_VBT_HAVE_DATA_FILE</span><br><span style="color: hsl(120, 100%, 40%);">+ if INTEL_GMA_HAVE_VBT && VARIANT_DIR != ""</span><br><span style="color: hsl(120, 100%, 40%);">+ default "src/mainboard/$(MAINBOARDDIR)/data.vbt" if INTEL_GMA_HAVE_VBT</span><br><span> default "3rdparty/blobs/mainboard/$(MAINBOARDDIR)/vbt.bin"</span><br><span> help</span><br><span> The path and filename of the VBT binary.</span><br><span>diff --git a/src/drivers/intel/fsp1_1/Kconfig b/src/drivers/intel/fsp1_1/Kconfig</span><br><span>index 40dcaf8..a70f00d 100644</span><br><span>--- a/src/drivers/intel/fsp1_1/Kconfig</span><br><span>+++ b/src/drivers/intel/fsp1_1/Kconfig</span><br><span>@@ -16,7 +16,7 @@</span><br><span> config PLATFORM_USES_FSP1_1</span><br><span> bool</span><br><span> select UEFI_2_4_BINDING</span><br><span style="color: hsl(0, 100%, 40%);">- select INTEL_GMA_ADD_VBT_DATA_FILE if RUN_FSP_GOP</span><br><span style="color: hsl(120, 100%, 40%);">+ select INTEL_GMA_ADD_VBT if RUN_FSP_GOP</span><br><span> help</span><br><span> Does the code require the Intel Firmware Support Package?</span><br><span> </span><br><span>diff --git a/src/drivers/intel/fsp1_1/Makefile.inc b/src/drivers/intel/fsp1_1/Makefile.inc</span><br><span>index 80af193..953d1e4 100644</span><br><span>--- a/src/drivers/intel/fsp1_1/Makefile.inc</span><br><span>+++ b/src/drivers/intel/fsp1_1/Makefile.inc</span><br><span>@@ -38,7 +38,7 @@</span><br><span> ramstage-y += hob.c</span><br><span> ramstage-y += ramstage.c</span><br><span> ramstage-y += stage_cache.c</span><br><span style="color: hsl(0, 100%, 40%);">-ramstage-$(CONFIG_INTEL_GMA_ADD_VBT_DATA_FILE) += vbt.c</span><br><span style="color: hsl(120, 100%, 40%);">+ramstage-$(CONFIG_INTEL_GMA_ADD_VBT) += vbt.c</span><br><span> ramstage-$(CONFIG_MMA) += mma_core.c</span><br><span> </span><br><span> CPPFLAGS_common += -Isrc/drivers/intel/fsp1_1/include</span><br><span>diff --git a/src/drivers/intel/gma/Makefile.inc b/src/drivers/intel/gma/Makefile.inc</span><br><span>index 0bcf590..30b3749 100644</span><br><span>--- a/src/drivers/intel/gma/Makefile.inc</span><br><span>+++ b/src/drivers/intel/gma/Makefile.inc</span><br><span>@@ -21,7 +21,7 @@</span><br><span> ramstage-$(CONFIG_INTEL_GMA_ACPI) += acpi.c</span><br><span> ramstage-$(CONFIG_INTEL_GMA_ACPI) += opregion.c</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-cbfs-files-$(CONFIG_INTEL_GMA_ADD_VBT_DATA_FILE) += vbt.bin</span><br><span style="color: hsl(120, 100%, 40%);">+cbfs-files-$(CONFIG_INTEL_GMA_ADD_VBT) += vbt.bin</span><br><span> vbt.bin-file := $(call strip_quotes,$(CONFIG_INTEL_GMA_VBT_FILE))</span><br><span> vbt.bin-type := raw</span><br><span> vbt.bin-compression := lzma</span><br><span>diff --git a/src/mainboard/asrock/g41c-gs/Kconfig b/src/mainboard/asrock/g41c-gs/Kconfig</span><br><span>index 6dc02c4..03c10fd 100644</span><br><span>--- a/src/mainboard/asrock/g41c-gs/Kconfig</span><br><span>+++ b/src/mainboard/asrock/g41c-gs/Kconfig</span><br><span>@@ -34,7 +34,7 @@</span><br><span> select HAVE_CMOS_DEFAULT</span><br><span> select HAVE_ACPI_RESUME</span><br><span> select DRIVERS_I2C_CK505</span><br><span style="color: hsl(0, 100%, 40%);">- select INTEL_GMA_VBT_HAVE_DATA_FILE</span><br><span style="color: hsl(120, 100%, 40%);">+ select INTEL_GMA_HAVE_VBT</span><br><span> </span><br><span> config MAINBOARD_DIR</span><br><span> string</span><br><span>diff --git a/src/mainboard/asus/p5gc-mx/Kconfig b/src/mainboard/asus/p5gc-mx/Kconfig</span><br><span>index 68ac58e..04a9b8b 100644</span><br><span>--- a/src/mainboard/asus/p5gc-mx/Kconfig</span><br><span>+++ b/src/mainboard/asus/p5gc-mx/Kconfig</span><br><span>@@ -31,7 +31,7 @@</span><br><span> select BOARD_ROMSIZE_KB_512</span><br><span> select CHANNEL_XOR_RANDOMIZATION</span><br><span> select MAINBOARD_HAS_NATIVE_VGA_INIT</span><br><span style="color: hsl(0, 100%, 40%);">- select INTEL_GMA_VBT_HAVE_DATA_FILE</span><br><span style="color: hsl(120, 100%, 40%);">+ select INTEL_GMA_HAVE_VBT</span><br><span> </span><br><span> config MAINBOARD_DIR</span><br><span> string</span><br><span>diff --git a/src/mainboard/foxconn/g41s-k/Kconfig b/src/mainboard/foxconn/g41s-k/Kconfig</span><br><span>index 9152aec..83a540e 100644</span><br><span>--- a/src/mainboard/foxconn/g41s-k/Kconfig</span><br><span>+++ b/src/mainboard/foxconn/g41s-k/Kconfig</span><br><span>@@ -34,7 +34,7 @@</span><br><span> select PCIEXP_ASPM</span><br><span> select PCIEXP_CLK_PM</span><br><span> select PCIEXP_L1_SUB_STATE</span><br><span style="color: hsl(0, 100%, 40%);">- select INTEL_GMA_VBT_HAVE_DATA_FILE</span><br><span style="color: hsl(120, 100%, 40%);">+ select INTEL_GMA_HAVE_VBT</span><br><span> </span><br><span> config MAINBOARD_DIR</span><br><span> string</span><br><span>diff --git a/src/mainboard/gigabyte/ga-945gcm-s2l/Kconfig b/src/mainboard/gigabyte/ga-945gcm-s2l/Kconfig</span><br><span>index 5581a7f..d1a7b5d 100644</span><br><span>--- a/src/mainboard/gigabyte/ga-945gcm-s2l/Kconfig</span><br><span>+++ b/src/mainboard/gigabyte/ga-945gcm-s2l/Kconfig</span><br><span>@@ -32,7 +32,7 @@</span><br><span> select CHANNEL_XOR_RANDOMIZATION</span><br><span> select MAINBOARD_HAS_NATIVE_VGA_INIT</span><br><span> select REALTEK_8168_RESET if BOARD_GIGABYTE_GA_945GCM_S2L</span><br><span style="color: hsl(0, 100%, 40%);">- select INTEL_GMA_VBT_HAVE_DATA_FILE</span><br><span style="color: hsl(120, 100%, 40%);">+ select INTEL_GMA_HAVE_VBT</span><br><span> </span><br><span> config MAINBOARD_DIR</span><br><span> string</span><br><span>diff --git a/src/mainboard/gigabyte/ga-g41m-es2l/Kconfig b/src/mainboard/gigabyte/ga-g41m-es2l/Kconfig</span><br><span>index 1e90eea..c6d708d 100644</span><br><span>--- a/src/mainboard/gigabyte/ga-g41m-es2l/Kconfig</span><br><span>+++ b/src/mainboard/gigabyte/ga-g41m-es2l/Kconfig</span><br><span>@@ -33,7 +33,7 @@</span><br><span> select HAVE_OPTION_TABLE</span><br><span> select HAVE_CMOS_DEFAULT</span><br><span> select HAVE_ACPI_RESUME</span><br><span style="color: hsl(0, 100%, 40%);">- select INTEL_GMA_VBT_HAVE_DATA_FILE</span><br><span style="color: hsl(120, 100%, 40%);">+ select INTEL_GMA_HAVE_VBT</span><br><span> </span><br><span> config MAINBOARD_DIR</span><br><span> string</span><br><span>diff --git a/src/mainboard/intel/d945gclf/Kconfig b/src/mainboard/intel/d945gclf/Kconfig</span><br><span>index b14a105..e3391be 100644</span><br><span>--- a/src/mainboard/intel/d945gclf/Kconfig</span><br><span>+++ b/src/mainboard/intel/d945gclf/Kconfig</span><br><span>@@ -30,7 +30,7 @@</span><br><span> select BOARD_ROMSIZE_KB_512</span><br><span> select CHANNEL_XOR_RANDOMIZATION</span><br><span> select MAINBOARD_HAS_NATIVE_VGA_INIT</span><br><span style="color: hsl(0, 100%, 40%);">- select INTEL_GMA_VBT_HAVE_DATA_FILE</span><br><span style="color: hsl(120, 100%, 40%);">+ select INTEL_GMA_HAVE_VBT</span><br><span> </span><br><span> config MAINBOARD_DIR</span><br><span> string</span><br><span>diff --git a/src/mainboard/intel/dg41wv/Kconfig b/src/mainboard/intel/dg41wv/Kconfig</span><br><span>index 957b8c5..22e7e0f 100644</span><br><span>--- a/src/mainboard/intel/dg41wv/Kconfig</span><br><span>+++ b/src/mainboard/intel/dg41wv/Kconfig</span><br><span>@@ -34,7 +34,7 @@</span><br><span> select HAVE_CMOS_DEFAULT</span><br><span> select HAVE_ACPI_RESUME</span><br><span> select DRIVERS_I2C_CK505</span><br><span style="color: hsl(0, 100%, 40%);">- select INTEL_GMA_VBT_HAVE_DATA_FILE</span><br><span style="color: hsl(120, 100%, 40%);">+ select INTEL_GMA_HAVE_VBT</span><br><span> </span><br><span> config MAINBOARD_DIR</span><br><span> string</span><br><span>diff --git a/src/mainboard/intel/dg43gt/Kconfig b/src/mainboard/intel/dg43gt/Kconfig</span><br><span>index e955aa0..aabc703 100644</span><br><span>--- a/src/mainboard/intel/dg43gt/Kconfig</span><br><span>+++ b/src/mainboard/intel/dg43gt/Kconfig</span><br><span>@@ -34,7 +34,7 @@</span><br><span> select MAINBOARD_HAS_NATIVE_VGA_INIT</span><br><span> select GFX_GMA_ANALOG_I2C_HDMI_C</span><br><span> select DRIVERS_I2C_CK505</span><br><span style="color: hsl(0, 100%, 40%);">- select INTEL_GMA_VBT_HAVE_DATA_FILE</span><br><span style="color: hsl(120, 100%, 40%);">+ select INTEL_GMA_HAVE_VBT</span><br><span> </span><br><span> config VGA_BIOS_ID</span><br><span> string</span><br><span>diff --git a/src/mainboard/lenovo/t420/Kconfig b/src/mainboard/lenovo/t420/Kconfig</span><br><span>index 1c20245..40fd213 100644</span><br><span>--- a/src/mainboard/lenovo/t420/Kconfig</span><br><span>+++ b/src/mainboard/lenovo/t420/Kconfig</span><br><span>@@ -24,7 +24,7 @@</span><br><span> select MAINBOARD_HAS_LIBGFXINIT</span><br><span> select GFX_GMA_INTERNAL_IS_LVDS</span><br><span> select DRIVERS_LENOVO_HYBRID_GRAPHICS</span><br><span style="color: hsl(0, 100%, 40%);">- select INTEL_GMA_VBT_HAVE_DATA_FILE</span><br><span style="color: hsl(120, 100%, 40%);">+ select INTEL_GMA_HAVE_VBT</span><br><span> </span><br><span> # Workaround for EC/KBC IRQ1.</span><br><span> select SERIRQ_CONTINUOUS_MODE</span><br><span>diff --git a/src/mainboard/lenovo/t420s/Kconfig b/src/mainboard/lenovo/t420s/Kconfig</span><br><span>index d17b9a9..ae50975 100644</span><br><span>--- a/src/mainboard/lenovo/t420s/Kconfig</span><br><span>+++ b/src/mainboard/lenovo/t420s/Kconfig</span><br><span>@@ -20,7 +20,7 @@</span><br><span> select MAINBOARD_HAS_LPC_TPM</span><br><span> select MAINBOARD_HAS_TPM1</span><br><span> select DRIVERS_LENOVO_HYBRID_GRAPHICS</span><br><span style="color: hsl(0, 100%, 40%);">- select INTEL_GMA_VBT_HAVE_DATA_FILE</span><br><span style="color: hsl(120, 100%, 40%);">+ select INTEL_GMA_HAVE_VBT</span><br><span> </span><br><span> # Workaround for EC/KBC IRQ1.</span><br><span> select SERIRQ_CONTINUOUS_MODE</span><br><span>diff --git a/src/mainboard/lenovo/t430/Kconfig b/src/mainboard/lenovo/t430/Kconfig</span><br><span>index 4843b75..f119def 100644</span><br><span>--- a/src/mainboard/lenovo/t430/Kconfig</span><br><span>+++ b/src/mainboard/lenovo/t430/Kconfig</span><br><span>@@ -25,7 +25,7 @@</span><br><span> select DRIVERS_LENOVO_HYBRID_GRAPHICS</span><br><span> select MAINBOARD_HAS_LIBGFXINIT</span><br><span> select GFX_GMA_INTERNAL_IS_LVDS</span><br><span style="color: hsl(0, 100%, 40%);">- select INTEL_GMA_VBT_HAVE_DATA_FILE</span><br><span style="color: hsl(120, 100%, 40%);">+ select INTEL_GMA_HAVE_VBT</span><br><span> </span><br><span> config HAVE_IFD_BIN</span><br><span> bool</span><br><span>diff --git a/src/mainboard/lenovo/t430s/Kconfig b/src/mainboard/lenovo/t430s/Kconfig</span><br><span>index 82c05e7..a938dcc 100644</span><br><span>--- a/src/mainboard/lenovo/t430s/Kconfig</span><br><span>+++ b/src/mainboard/lenovo/t430s/Kconfig</span><br><span>@@ -22,7 +22,7 @@</span><br><span> select MAINBOARD_HAS_TPM1</span><br><span> select MAINBOARD_HAS_LIBGFXINIT</span><br><span> select GFX_GMA_INTERNAL_IS_LVDS</span><br><span style="color: hsl(0, 100%, 40%);">- select INTEL_GMA_VBT_HAVE_DATA_FILE</span><br><span style="color: hsl(120, 100%, 40%);">+ select INTEL_GMA_HAVE_VBT</span><br><span> </span><br><span> # Workaround for EC/KBC IRQ1.</span><br><span> select SERIRQ_CONTINUOUS_MODE</span><br><span>diff --git a/src/mainboard/lenovo/t520/Kconfig b/src/mainboard/lenovo/t520/Kconfig</span><br><span>index 16e2a34..824f299 100644</span><br><span>--- a/src/mainboard/lenovo/t520/Kconfig</span><br><span>+++ b/src/mainboard/lenovo/t520/Kconfig</span><br><span>@@ -18,7 +18,7 @@</span><br><span> select MAINBOARD_HAS_LPC_TPM</span><br><span> select MAINBOARD_HAS_TPM1</span><br><span> select DRIVERS_LENOVO_HYBRID_GRAPHICS</span><br><span style="color: hsl(0, 100%, 40%);">- select INTEL_GMA_VBT_HAVE_DATA_FILE if BOARD_LENOVO_T520</span><br><span style="color: hsl(120, 100%, 40%);">+ select INTEL_GMA_HAVE_VBT if BOARD_LENOVO_T520</span><br><span> </span><br><span> # Workaround for EC/KBC IRQ1.</span><br><span> select SERIRQ_CONTINUOUS_MODE</span><br><span>diff --git a/src/mainboard/lenovo/t530/Kconfig b/src/mainboard/lenovo/t530/Kconfig</span><br><span>index 53953cd..0bbf941 100644</span><br><span>--- a/src/mainboard/lenovo/t530/Kconfig</span><br><span>+++ b/src/mainboard/lenovo/t530/Kconfig</span><br><span>@@ -21,7 +21,7 @@</span><br><span> select DRIVERS_LENOVO_HYBRID_GRAPHICS</span><br><span> select MAINBOARD_HAS_LIBGFXINIT</span><br><span> select GFX_GMA_INTERNAL_IS_LVDS</span><br><span style="color: hsl(0, 100%, 40%);">- select INTEL_GMA_VBT_HAVE_DATA_FILE</span><br><span style="color: hsl(120, 100%, 40%);">+ select INTEL_GMA_HAVE_VBT</span><br><span> </span><br><span> # Workaround for EC/KBC IRQ1.</span><br><span> select SERIRQ_CONTINUOUS_MODE</span><br><span>diff --git a/src/mainboard/lenovo/t60/Kconfig b/src/mainboard/lenovo/t60/Kconfig</span><br><span>index 205a0f0..54c469b 100644</span><br><span>--- a/src/mainboard/lenovo/t60/Kconfig</span><br><span>+++ b/src/mainboard/lenovo/t60/Kconfig</span><br><span>@@ -23,7 +23,7 @@</span><br><span> select H8_DOCK_EARLY_INIT</span><br><span> select HAVE_CMOS_DEFAULT</span><br><span> select I945_LVDS</span><br><span style="color: hsl(0, 100%, 40%);">- select INTEL_GMA_VBT_HAVE_DATA_FILE</span><br><span style="color: hsl(120, 100%, 40%);">+ select INTEL_GMA_HAVE_VBT</span><br><span> </span><br><span> config MAINBOARD_DIR</span><br><span> string</span><br><span>diff --git a/src/mainboard/lenovo/x220/Kconfig b/src/mainboard/lenovo/x220/Kconfig</span><br><span>index fa14fde..54d3648 100644</span><br><span>--- a/src/mainboard/lenovo/x220/Kconfig</span><br><span>+++ b/src/mainboard/lenovo/x220/Kconfig</span><br><span>@@ -21,7 +21,7 @@</span><br><span> select MAINBOARD_HAS_TPM1</span><br><span> select MAINBOARD_HAS_LIBGFXINIT</span><br><span> select GFX_GMA_INTERNAL_IS_LVDS</span><br><span style="color: hsl(0, 100%, 40%);">- select INTEL_GMA_VBT_HAVE_DATA_FILE</span><br><span style="color: hsl(120, 100%, 40%);">+ select INTEL_GMA_HAVE_VBT</span><br><span> </span><br><span> # Workaround for EC/KBC IRQ1.</span><br><span> select SERIRQ_CONTINUOUS_MODE</span><br><span>diff --git a/src/mainboard/lenovo/x230/Kconfig b/src/mainboard/lenovo/x230/Kconfig</span><br><span>index 8995daf..29c0e7b 100644</span><br><span>--- a/src/mainboard/lenovo/x230/Kconfig</span><br><span>+++ b/src/mainboard/lenovo/x230/Kconfig</span><br><span>@@ -22,7 +22,7 @@</span><br><span> select MAINBOARD_HAS_TPM1</span><br><span> select MAINBOARD_HAS_LIBGFXINIT</span><br><span> select GFX_GMA_INTERNAL_IS_LVDS</span><br><span style="color: hsl(0, 100%, 40%);">- select INTEL_GMA_VBT_HAVE_DATA_FILE</span><br><span style="color: hsl(120, 100%, 40%);">+ select INTEL_GMA_HAVE_VBT</span><br><span> </span><br><span> # Workaround for EC/KBC IRQ1.</span><br><span> select SERIRQ_CONTINUOUS_MODE</span><br><span>diff --git a/src/mainboard/lenovo/x60/Kconfig b/src/mainboard/lenovo/x60/Kconfig</span><br><span>index 6a94259..de2e4ff 100644</span><br><span>--- a/src/mainboard/lenovo/x60/Kconfig</span><br><span>+++ b/src/mainboard/lenovo/x60/Kconfig</span><br><span>@@ -26,7 +26,7 @@</span><br><span> select H8_DOCK_EARLY_INIT</span><br><span> select DRIVERS_LENOVO_WACOM</span><br><span> select I945_LVDS</span><br><span style="color: hsl(0, 100%, 40%);">- select INTEL_GMA_VBT_HAVE_DATA_FILE</span><br><span style="color: hsl(120, 100%, 40%);">+ select INTEL_GMA_HAVE_VBT</span><br><span> </span><br><span> config MAINBOARD_DIR</span><br><span> string</span><br><span>diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig</span><br><span>index 830b32b..4577e76 100644</span><br><span>--- a/src/soc/intel/apollolake/Kconfig</span><br><span>+++ b/src/soc/intel/apollolake/Kconfig</span><br><span>@@ -104,7 +104,7 @@</span><br><span> select UDK_2015_BINDING if !SOC_INTEL_GLK</span><br><span> select UDK_2017_BINDING if SOC_INTEL_GLK</span><br><span> select HAVE_HARD_RESET</span><br><span style="color: hsl(0, 100%, 40%);">- select INTEL_GMA_ADD_VBT_DATA_FILE if RUN_FSP_GOP</span><br><span style="color: hsl(120, 100%, 40%);">+ select INTEL_GMA_ADD_VBT if RUN_FSP_GOP</span><br><span> select HAVE_FSP_GOP</span><br><span> select NO_UART_ON_SUPERIO</span><br><span> select INTEL_GMA_ACPI</span><br><span>diff --git a/src/soc/intel/braswell/acpi.c b/src/soc/intel/braswell/acpi.c</span><br><span>index 1aa6cf3..91d4925 100644</span><br><span>--- a/src/soc/intel/braswell/acpi.c</span><br><span>+++ b/src/soc/intel/braswell/acpi.c</span><br><span>@@ -492,7 +492,7 @@</span><br><span> current = acpi_write_hpet(device, current, rsdp);</span><br><span> current = acpi_align_current(current);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (IS_ENABLED(CONFIG_INTEL_GMA_ADD_VBT_DATA_FILE)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (IS_ENABLED(CONFIG_INTEL_GMA_ADD_VBT)) {</span><br><span> igd_opregion_t *opregion;</span><br><span> </span><br><span> printk(BIOS_DEBUG, "ACPI: * IGD OpRegion\n");</span><br><span>diff --git a/src/soc/intel/cannonlake/Kconfig b/src/soc/intel/cannonlake/Kconfig</span><br><span>index dd36936..005ed99 100644</span><br><span>--- a/src/soc/intel/cannonlake/Kconfig</span><br><span>+++ b/src/soc/intel/cannonlake/Kconfig</span><br><span>@@ -28,7 +28,7 @@</span><br><span> select HAVE_SMI_HANDLER</span><br><span> select IDT_IN_EVERY_STAGE</span><br><span> select INTEL_GMA_ACPI</span><br><span style="color: hsl(0, 100%, 40%);">- select INTEL_GMA_ADD_VBT_DATA_FILE if RUN_FSP_GOP</span><br><span style="color: hsl(120, 100%, 40%);">+ select INTEL_GMA_ADD_VBT if RUN_FSP_GOP</span><br><span> select IOAPIC</span><br><span> select MRC_SETTINGS_PROTECT</span><br><span> select PARALLEL_MP</span><br><span>diff --git a/src/soc/intel/cannonlake/graphics.c b/src/soc/intel/cannonlake/graphics.c</span><br><span>index 1487a31..58f87f7 100644</span><br><span>--- a/src/soc/intel/cannonlake/graphics.c</span><br><span>+++ b/src/soc/intel/cannonlake/graphics.c</span><br><span>@@ -46,14 +46,14 @@</span><br><span> </span><br><span> /*</span><br><span> * GFX PEIM module inside FSP binary is taking care of graphics</span><br><span style="color: hsl(0, 100%, 40%);">- * initialization based on INTEL_GMA_ADD_VBT_DATA_FILE Kconfig</span><br><span style="color: hsl(120, 100%, 40%);">+ * initialization based on INTEL_GMA_ADD_VBT Kconfig</span><br><span> * option and input VBT file. Hence no need to load/execute legacy VGA</span><br><span> * OpROM in order to initialize GFX.</span><br><span> *</span><br><span> * In case of non-FSP solution, SoC need to select VGA_ROM_RUN</span><br><span> * Kconfig to perform GFX initialization through VGA OpRom.</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">- if (IS_ENABLED(CONFIG_INTEL_GMA_ADD_VBT_DATA_FILE))</span><br><span style="color: hsl(120, 100%, 40%);">+ if (IS_ENABLED(CONFIG_INTEL_GMA_ADD_VBT))</span><br><span> return;</span><br><span> </span><br><span> /* IGD needs to Bus Master */</span><br><span>diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig</span><br><span>index b3e9d94..3e0158b 100644</span><br><span>--- a/src/soc/intel/skylake/Kconfig</span><br><span>+++ b/src/soc/intel/skylake/Kconfig</span><br><span>@@ -84,7 +84,7 @@</span><br><span> depends on MAINBOARD_USES_FSP2_0</span><br><span> select PLATFORM_USES_FSP2_0</span><br><span> select UDK_2015_BINDING</span><br><span style="color: hsl(0, 100%, 40%);">- select INTEL_GMA_ADD_VBT_DATA_FILE if RUN_FSP_GOP</span><br><span style="color: hsl(120, 100%, 40%);">+ select INTEL_GMA_ADD_VBT if RUN_FSP_GOP</span><br><span> select POSTCAR_CONSOLE</span><br><span> select POSTCAR_STAGE</span><br><span> </span><br><span>diff --git a/src/soc/intel/skylake/graphics.c b/src/soc/intel/skylake/graphics.c</span><br><span>index 8991fa3..33841b3 100644</span><br><span>--- a/src/soc/intel/skylake/graphics.c</span><br><span>+++ b/src/soc/intel/skylake/graphics.c</span><br><span>@@ -101,7 +101,7 @@</span><br><span> global_nvs_t *gnvs = cbmem_find(CBMEM_ID_ACPI_GNVS);</span><br><span> </span><br><span> /* If GOP is not used, exit here */</span><br><span style="color: hsl(0, 100%, 40%);">- if (!IS_ENABLED(CONFIG_INTEL_GMA_ADD_VBT_DATA_FILE))</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!IS_ENABLED(CONFIG_INTEL_GMA_ADD_VBT))</span><br><span> return current;</span><br><span> </span><br><span> /* If IGD is disabled, exit here */</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/26898">change 26898</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/26898"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I0b0d50ea729e5580c0bc7b43f250ff387ce59cfc </div>
<div style="display:none"> Gerrit-Change-Number: 26898 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Nico Huber <nico.h@gmx.de> </div>