From 29cc33181a18e76d033a4f8dc5d3bbd982ce4b9b Mon Sep 17 00:00:00 2001 From: Nico Huber Date: Wed, 6 Jun 2018 17:40:02 +0200 Subject: drivers/intel/gma: Unify VBT related Kconfig names Shuffle words and drop the _DATA_FILE suffix. Change-Id: I0b0d50ea729e5580c0bc7b43f250ff387ce59cfc Signed-off-by: Nico Huber Reviewed-on: https://review.coreboot.org/26898 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Arthur Heymans --- src/device/Kconfig | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/device/Kconfig') diff --git a/src/device/Kconfig b/src/device/Kconfig index 1ed9b1bc93..016e1047a4 100644 --- a/src/device/Kconfig +++ b/src/device/Kconfig @@ -598,16 +598,16 @@ config VGA_BIOS_ID Under GNU/Linux you can run `lspci -nn` to list the IDs of your PCI devices. -config INTEL_GMA_VBT_HAVE_DATA_FILE +config INTEL_GMA_HAVE_VBT bool help Select this in the mainboard Kconfig to indicate the board has a data.vbt file. -config INTEL_GMA_ADD_VBT_DATA_FILE +config INTEL_GMA_ADD_VBT 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_DATA_FILE + default y if INTEL_GMA_HAVE_VBT 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 @@ -615,10 +615,10 @@ config INTEL_GMA_ADD_VBT_DATA_FILE config INTEL_GMA_VBT_FILE string "VBT binary path and filename" - depends on INTEL_GMA_ADD_VBT_DATA_FILE + depends on INTEL_GMA_ADD_VBT default "src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt" \ - if INTEL_GMA_VBT_HAVE_DATA_FILE && VARIANT_DIR != "" - default "src/mainboard/$(MAINBOARDDIR)/data.vbt" if INTEL_GMA_VBT_HAVE_DATA_FILE + if INTEL_GMA_HAVE_VBT && VARIANT_DIR != "" + default "src/mainboard/$(MAINBOARDDIR)/data.vbt" if INTEL_GMA_HAVE_VBT default "3rdparty/blobs/mainboard/$(MAINBOARDDIR)/vbt.bin" help The path and filename of the VBT binary. -- cgit v1.2.3