drivers/intel/gma: Unify VBT related Kconfig names

Shuffle words and drop the _DATA_FILE suffix.

Change-Id: I0b0d50ea729e5580c0bc7b43f250ff387ce59cfc
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/26898
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>

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 != ""
+		if INTEL_GMA_HAVE_VBT && VARIANT_DIR != ""
-	default "src/mainboard/$(MAINBOARDDIR)/data.vbt" if INTEL_GMA_VBT_HAVE_DATA_FILE
+	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.

src/drivers/intel/fsp1_1/Kconfig

@@ -16,7 +16,7 @@
 config PLATFORM_USES_FSP1_1
 	bool
 	select UEFI_2_4_BINDING
-	select INTEL_GMA_ADD_VBT_DATA_FILE if RUN_FSP_GOP
+	select INTEL_GMA_ADD_VBT if RUN_FSP_GOP
 	help
 	  Does the code require the Intel Firmware Support Package?
 

src/drivers/intel/fsp1_1/Makefile.inc

@@ -38,7 +38,7 @@ ramstage-y += fsp_util.c
 ramstage-y += hob.c
 ramstage-y += ramstage.c
 ramstage-y += stage_cache.c
-ramstage-$(CONFIG_INTEL_GMA_ADD_VBT_DATA_FILE) += vbt.c
+ramstage-$(CONFIG_INTEL_GMA_ADD_VBT) += vbt.c
 ramstage-$(CONFIG_MMA) += mma_core.c
 
 CPPFLAGS_common += -Isrc/drivers/intel/fsp1_1/include

src/drivers/intel/gma/Makefile.inc

@@ -21,7 +21,7 @@ endif
 ramstage-$(CONFIG_INTEL_GMA_ACPI) += acpi.c
 ramstage-$(CONFIG_INTEL_GMA_ACPI) += opregion.c
 
-cbfs-files-$(CONFIG_INTEL_GMA_ADD_VBT_DATA_FILE) += vbt.bin
+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

src/mainboard/asrock/g41c-gs/Kconfig

@@ -34,7 +34,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select HAVE_CMOS_DEFAULT
 	select HAVE_ACPI_RESUME
 	select DRIVERS_I2C_CK505
-	select INTEL_GMA_VBT_HAVE_DATA_FILE
+	select INTEL_GMA_HAVE_VBT
 
 config MAINBOARD_DIR
 	string

src/mainboard/asus/p5gc-mx/Kconfig

@@ -31,7 +31,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select BOARD_ROMSIZE_KB_512
 	select CHANNEL_XOR_RANDOMIZATION
 	select MAINBOARD_HAS_NATIVE_VGA_INIT
-	select INTEL_GMA_VBT_HAVE_DATA_FILE
+	select INTEL_GMA_HAVE_VBT
 
 config MAINBOARD_DIR
 	string

src/mainboard/foxconn/g41s-k/Kconfig

@@ -34,7 +34,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select PCIEXP_ASPM
 	select PCIEXP_CLK_PM
 	select PCIEXP_L1_SUB_STATE
-	select INTEL_GMA_VBT_HAVE_DATA_FILE
+	select INTEL_GMA_HAVE_VBT
 
 config MAINBOARD_DIR
 	string

src/mainboard/gigabyte/ga-945gcm-s2l/Kconfig

@@ -32,7 +32,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select CHANNEL_XOR_RANDOMIZATION
 	select MAINBOARD_HAS_NATIVE_VGA_INIT
 	select REALTEK_8168_RESET if BOARD_GIGABYTE_GA_945GCM_S2L
-	select INTEL_GMA_VBT_HAVE_DATA_FILE
+	select INTEL_GMA_HAVE_VBT
 
 config MAINBOARD_DIR
 	string

src/mainboard/gigabyte/ga-g41m-es2l/Kconfig

@@ -33,7 +33,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select HAVE_OPTION_TABLE
 	select HAVE_CMOS_DEFAULT
 	select HAVE_ACPI_RESUME
-	select INTEL_GMA_VBT_HAVE_DATA_FILE
+	select INTEL_GMA_HAVE_VBT
 
 config MAINBOARD_DIR
 	string

src/mainboard/intel/d945gclf/Kconfig

@@ -30,7 +30,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select BOARD_ROMSIZE_KB_512
 	select CHANNEL_XOR_RANDOMIZATION
 	select MAINBOARD_HAS_NATIVE_VGA_INIT
-	select INTEL_GMA_VBT_HAVE_DATA_FILE
+	select INTEL_GMA_HAVE_VBT
 
 config MAINBOARD_DIR
 	string

src/mainboard/intel/dg41wv/Kconfig

@@ -34,7 +34,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select HAVE_CMOS_DEFAULT
 	select HAVE_ACPI_RESUME
 	select DRIVERS_I2C_CK505
-	select INTEL_GMA_VBT_HAVE_DATA_FILE
+	select INTEL_GMA_HAVE_VBT
 
 config MAINBOARD_DIR
 	string

src/mainboard/intel/dg43gt/Kconfig

@@ -34,7 +34,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select MAINBOARD_HAS_NATIVE_VGA_INIT
 	select GFX_GMA_ANALOG_I2C_HDMI_C
 	select DRIVERS_I2C_CK505
-	select INTEL_GMA_VBT_HAVE_DATA_FILE
+	select INTEL_GMA_HAVE_VBT
 
 config VGA_BIOS_ID
 	string

src/mainboard/lenovo/t420/Kconfig

@@ -24,7 +24,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select MAINBOARD_HAS_LIBGFXINIT
 	select GFX_GMA_INTERNAL_IS_LVDS
 	select DRIVERS_LENOVO_HYBRID_GRAPHICS
-	select INTEL_GMA_VBT_HAVE_DATA_FILE
+	select INTEL_GMA_HAVE_VBT
 
 	# Workaround for EC/KBC IRQ1.
 	select SERIRQ_CONTINUOUS_MODE

src/mainboard/lenovo/t420s/Kconfig

@@ -20,7 +20,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select MAINBOARD_HAS_LPC_TPM
 	select MAINBOARD_HAS_TPM1
 	select DRIVERS_LENOVO_HYBRID_GRAPHICS
-	select INTEL_GMA_VBT_HAVE_DATA_FILE
+	select INTEL_GMA_HAVE_VBT
 
 	# Workaround for EC/KBC IRQ1.
 	select SERIRQ_CONTINUOUS_MODE

src/mainboard/lenovo/t430/Kconfig

@@ -25,7 +25,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select DRIVERS_LENOVO_HYBRID_GRAPHICS
 	select MAINBOARD_HAS_LIBGFXINIT
 	select GFX_GMA_INTERNAL_IS_LVDS
-	select INTEL_GMA_VBT_HAVE_DATA_FILE
+	select INTEL_GMA_HAVE_VBT
 
 config HAVE_IFD_BIN
 	bool

src/mainboard/lenovo/t430s/Kconfig

@@ -22,7 +22,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select MAINBOARD_HAS_TPM1
 	select MAINBOARD_HAS_LIBGFXINIT
 	select GFX_GMA_INTERNAL_IS_LVDS
-	select INTEL_GMA_VBT_HAVE_DATA_FILE
+	select INTEL_GMA_HAVE_VBT
 
 	# Workaround for EC/KBC IRQ1.
 	select SERIRQ_CONTINUOUS_MODE

src/mainboard/lenovo/t520/Kconfig

@@ -18,7 +18,7 @@ config BOARD_LENOVO_BASEBOARD_T520
 	select MAINBOARD_HAS_LPC_TPM
 	select MAINBOARD_HAS_TPM1
 	select DRIVERS_LENOVO_HYBRID_GRAPHICS
-	select INTEL_GMA_VBT_HAVE_DATA_FILE if BOARD_LENOVO_T520
+	select INTEL_GMA_HAVE_VBT if BOARD_LENOVO_T520
 
 	# Workaround for EC/KBC IRQ1.
 	select SERIRQ_CONTINUOUS_MODE

src/mainboard/lenovo/t530/Kconfig

@@ -21,7 +21,7 @@ config BOARD_LENOVO_BASEBOARD_T530
 	select DRIVERS_LENOVO_HYBRID_GRAPHICS
 	select MAINBOARD_HAS_LIBGFXINIT
 	select GFX_GMA_INTERNAL_IS_LVDS
-	select INTEL_GMA_VBT_HAVE_DATA_FILE
+	select INTEL_GMA_HAVE_VBT
 
 	# Workaround for EC/KBC IRQ1.
 	select SERIRQ_CONTINUOUS_MODE

src/mainboard/lenovo/t60/Kconfig

@@ -23,7 +23,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select H8_DOCK_EARLY_INIT
 	select HAVE_CMOS_DEFAULT
 	select I945_LVDS
-	select INTEL_GMA_VBT_HAVE_DATA_FILE
+	select INTEL_GMA_HAVE_VBT
 
 config MAINBOARD_DIR
 	string

src/mainboard/lenovo/x220/Kconfig

@@ -21,7 +21,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select MAINBOARD_HAS_TPM1
 	select MAINBOARD_HAS_LIBGFXINIT
 	select GFX_GMA_INTERNAL_IS_LVDS
-	select INTEL_GMA_VBT_HAVE_DATA_FILE
+	select INTEL_GMA_HAVE_VBT
 
 	# Workaround for EC/KBC IRQ1.
 	select SERIRQ_CONTINUOUS_MODE

src/mainboard/lenovo/x230/Kconfig

@@ -22,7 +22,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select MAINBOARD_HAS_TPM1
 	select MAINBOARD_HAS_LIBGFXINIT
 	select GFX_GMA_INTERNAL_IS_LVDS
-	select INTEL_GMA_VBT_HAVE_DATA_FILE
+	select INTEL_GMA_HAVE_VBT
 
 	# Workaround for EC/KBC IRQ1.
 	select SERIRQ_CONTINUOUS_MODE

src/mainboard/lenovo/x60/Kconfig

@@ -26,7 +26,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select H8_DOCK_EARLY_INIT
 	select DRIVERS_LENOVO_WACOM
 	select I945_LVDS
-	select INTEL_GMA_VBT_HAVE_DATA_FILE
+	select INTEL_GMA_HAVE_VBT
 
 config MAINBOARD_DIR
 	string

src/soc/intel/apollolake/Kconfig

@@ -104,7 +104,7 @@ config CPU_SPECIFIC_OPTIONS
 	select UDK_2015_BINDING if !SOC_INTEL_GLK
 	select UDK_2017_BINDING if SOC_INTEL_GLK
 	select HAVE_HARD_RESET
-	select INTEL_GMA_ADD_VBT_DATA_FILE if RUN_FSP_GOP
+	select INTEL_GMA_ADD_VBT if RUN_FSP_GOP
 	select HAVE_FSP_GOP
 	select NO_UART_ON_SUPERIO
 	select INTEL_GMA_ACPI

src/soc/intel/braswell/acpi.c

@@ -492,7 +492,7 @@ unsigned long southcluster_write_acpi_tables(struct device *device,
 	current = acpi_write_hpet(device, current, rsdp);
 	current = acpi_align_current(current);
 
-	if (IS_ENABLED(CONFIG_INTEL_GMA_ADD_VBT_DATA_FILE)) {
+	if (IS_ENABLED(CONFIG_INTEL_GMA_ADD_VBT)) {
 		igd_opregion_t *opregion;
 
 		printk(BIOS_DEBUG, "ACPI:    * IGD OpRegion\n");

src/soc/intel/cannonlake/Kconfig

@@ -28,7 +28,7 @@ config CPU_SPECIFIC_OPTIONS
 	select HAVE_SMI_HANDLER
 	select IDT_IN_EVERY_STAGE
 	select INTEL_GMA_ACPI
-	select INTEL_GMA_ADD_VBT_DATA_FILE if RUN_FSP_GOP
+	select INTEL_GMA_ADD_VBT if RUN_FSP_GOP
 	select IOAPIC
 	select MRC_SETTINGS_PROTECT
 	select PARALLEL_MP

src/soc/intel/cannonlake/graphics.c

@@ -46,14 +46,14 @@ void graphics_soc_init(struct device *dev)
 
 	/*
 	 * GFX PEIM module inside FSP binary is taking care of graphics
-	 * initialization based on INTEL_GMA_ADD_VBT_DATA_FILE Kconfig
+	 * initialization based on INTEL_GMA_ADD_VBT Kconfig
 	 * option and input VBT file. Hence no need to load/execute legacy VGA
 	 * OpROM in order to initialize GFX.
 	 *
 	 * In case of non-FSP solution, SoC need to select VGA_ROM_RUN
 	 * Kconfig to perform GFX initialization through VGA OpRom.
 	 */
-	if (IS_ENABLED(CONFIG_INTEL_GMA_ADD_VBT_DATA_FILE))
+	if (IS_ENABLED(CONFIG_INTEL_GMA_ADD_VBT))
 		return;
 
 	/* IGD needs to Bus Master */

src/soc/intel/skylake/Kconfig

@@ -84,7 +84,7 @@ config USE_FSP2_0_DRIVER
 	depends on MAINBOARD_USES_FSP2_0
 	select PLATFORM_USES_FSP2_0
 	select UDK_2015_BINDING
-	select INTEL_GMA_ADD_VBT_DATA_FILE if RUN_FSP_GOP
+	select INTEL_GMA_ADD_VBT if RUN_FSP_GOP
 	select POSTCAR_CONSOLE
 	select POSTCAR_STAGE
 

src/soc/intel/skylake/graphics.c

@@ -101,7 +101,7 @@ uintptr_t graphics_soc_write_acpi_opregion(struct device *device,
 	global_nvs_t *gnvs = cbmem_find(CBMEM_ID_ACPI_GNVS);
 
 	/* If GOP is not used, exit here */
-	if (!IS_ENABLED(CONFIG_INTEL_GMA_ADD_VBT_DATA_FILE))
+	if (!IS_ENABLED(CONFIG_INTEL_GMA_ADD_VBT))
 		return current;
 
 	/* If IGD is disabled, exit here */