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 ++++++------ src/drivers/intel/fsp1_1/Kconfig | 2 +- src/drivers/intel/fsp1_1/Makefile.inc | 2 +- src/drivers/intel/gma/Makefile.inc | 2 +- src/mainboard/asrock/g41c-gs/Kconfig | 2 +- src/mainboard/asus/p5gc-mx/Kconfig | 2 +- src/mainboard/foxconn/g41s-k/Kconfig | 2 +- src/mainboard/gigabyte/ga-945gcm-s2l/Kconfig | 2 +- src/mainboard/gigabyte/ga-g41m-es2l/Kconfig | 2 +- src/mainboard/intel/d945gclf/Kconfig | 2 +- src/mainboard/intel/dg41wv/Kconfig | 2 +- src/mainboard/intel/dg43gt/Kconfig | 2 +- src/mainboard/lenovo/t420/Kconfig | 2 +- src/mainboard/lenovo/t420s/Kconfig | 2 +- src/mainboard/lenovo/t430/Kconfig | 2 +- src/mainboard/lenovo/t430s/Kconfig | 2 +- src/mainboard/lenovo/t520/Kconfig | 2 +- src/mainboard/lenovo/t530/Kconfig | 2 +- src/mainboard/lenovo/t60/Kconfig | 2 +- src/mainboard/lenovo/x220/Kconfig | 2 +- src/mainboard/lenovo/x230/Kconfig | 2 +- src/mainboard/lenovo/x60/Kconfig | 2 +- src/soc/intel/apollolake/Kconfig | 2 +- src/soc/intel/braswell/acpi.c | 2 +- src/soc/intel/cannonlake/Kconfig | 2 +- src/soc/intel/cannonlake/graphics.c | 4 ++-- src/soc/intel/skylake/Kconfig | 2 +- src/soc/intel/skylake/graphics.c | 2 +- 28 files changed, 34 insertions(+), 34 deletions(-) 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. diff --git a/src/drivers/intel/fsp1_1/Kconfig b/src/drivers/intel/fsp1_1/Kconfig index 40dcaf84fc..a70f00d5ec 100644 --- a/src/drivers/intel/fsp1_1/Kconfig +++ b/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? diff --git a/src/drivers/intel/fsp1_1/Makefile.inc b/src/drivers/intel/fsp1_1/Makefile.inc index 80af1937bd..953d1e4ffe 100644 --- a/src/drivers/intel/fsp1_1/Makefile.inc +++ b/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 diff --git a/src/drivers/intel/gma/Makefile.inc b/src/drivers/intel/gma/Makefile.inc index 0bcf590c55..30b3749979 100644 --- a/src/drivers/intel/gma/Makefile.inc +++ b/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 diff --git a/src/mainboard/asrock/g41c-gs/Kconfig b/src/mainboard/asrock/g41c-gs/Kconfig index 6dc02c4bc9..03c10fdc8f 100644 --- a/src/mainboard/asrock/g41c-gs/Kconfig +++ b/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 diff --git a/src/mainboard/asus/p5gc-mx/Kconfig b/src/mainboard/asus/p5gc-mx/Kconfig index 68ac58e85d..04a9b8b3af 100644 --- a/src/mainboard/asus/p5gc-mx/Kconfig +++ b/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 diff --git a/src/mainboard/foxconn/g41s-k/Kconfig b/src/mainboard/foxconn/g41s-k/Kconfig index 9152aecf1a..83a540e267 100644 --- a/src/mainboard/foxconn/g41s-k/Kconfig +++ b/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 diff --git a/src/mainboard/gigabyte/ga-945gcm-s2l/Kconfig b/src/mainboard/gigabyte/ga-945gcm-s2l/Kconfig index 5581a7f0b5..d1a7b5db20 100644 --- a/src/mainboard/gigabyte/ga-945gcm-s2l/Kconfig +++ b/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 diff --git a/src/mainboard/gigabyte/ga-g41m-es2l/Kconfig b/src/mainboard/gigabyte/ga-g41m-es2l/Kconfig index 1e90eea4eb..c6d708d573 100644 --- a/src/mainboard/gigabyte/ga-g41m-es2l/Kconfig +++ b/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 diff --git a/src/mainboard/intel/d945gclf/Kconfig b/src/mainboard/intel/d945gclf/Kconfig index b14a10589b..e3391be115 100644 --- a/src/mainboard/intel/d945gclf/Kconfig +++ b/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 diff --git a/src/mainboard/intel/dg41wv/Kconfig b/src/mainboard/intel/dg41wv/Kconfig index 957b8c5513..22e7e0fe13 100644 --- a/src/mainboard/intel/dg41wv/Kconfig +++ b/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 diff --git a/src/mainboard/intel/dg43gt/Kconfig b/src/mainboard/intel/dg43gt/Kconfig index e955aa0222..aabc703830 100644 --- a/src/mainboard/intel/dg43gt/Kconfig +++ b/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 diff --git a/src/mainboard/lenovo/t420/Kconfig b/src/mainboard/lenovo/t420/Kconfig index 1c20245a38..40fd213b5d 100644 --- a/src/mainboard/lenovo/t420/Kconfig +++ b/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 diff --git a/src/mainboard/lenovo/t420s/Kconfig b/src/mainboard/lenovo/t420s/Kconfig index d17b9a95d6..ae50975ada 100644 --- a/src/mainboard/lenovo/t420s/Kconfig +++ b/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 diff --git a/src/mainboard/lenovo/t430/Kconfig b/src/mainboard/lenovo/t430/Kconfig index 4843b75c48..f119def477 100644 --- a/src/mainboard/lenovo/t430/Kconfig +++ b/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 diff --git a/src/mainboard/lenovo/t430s/Kconfig b/src/mainboard/lenovo/t430s/Kconfig index 82c05e76fe..a938dccec4 100644 --- a/src/mainboard/lenovo/t430s/Kconfig +++ b/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 diff --git a/src/mainboard/lenovo/t520/Kconfig b/src/mainboard/lenovo/t520/Kconfig index 16e2a34d8b..824f299862 100644 --- a/src/mainboard/lenovo/t520/Kconfig +++ b/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 diff --git a/src/mainboard/lenovo/t530/Kconfig b/src/mainboard/lenovo/t530/Kconfig index 53953cdd82..0bbf941743 100644 --- a/src/mainboard/lenovo/t530/Kconfig +++ b/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 diff --git a/src/mainboard/lenovo/t60/Kconfig b/src/mainboard/lenovo/t60/Kconfig index 205a0f0724..54c469b7c8 100644 --- a/src/mainboard/lenovo/t60/Kconfig +++ b/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 diff --git a/src/mainboard/lenovo/x220/Kconfig b/src/mainboard/lenovo/x220/Kconfig index fa14fde21c..54d3648225 100644 --- a/src/mainboard/lenovo/x220/Kconfig +++ b/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 diff --git a/src/mainboard/lenovo/x230/Kconfig b/src/mainboard/lenovo/x230/Kconfig index 8995daf874..29c0e7bd2f 100644 --- a/src/mainboard/lenovo/x230/Kconfig +++ b/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 diff --git a/src/mainboard/lenovo/x60/Kconfig b/src/mainboard/lenovo/x60/Kconfig index 6a94259bb5..de2e4ff118 100644 --- a/src/mainboard/lenovo/x60/Kconfig +++ b/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 diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig index 830b32be45..4577e76a72 100644 --- a/src/soc/intel/apollolake/Kconfig +++ b/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 diff --git a/src/soc/intel/braswell/acpi.c b/src/soc/intel/braswell/acpi.c index 1aa6cf32cc..91d4925663 100644 --- a/src/soc/intel/braswell/acpi.c +++ b/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"); diff --git a/src/soc/intel/cannonlake/Kconfig b/src/soc/intel/cannonlake/Kconfig index dd369365f9..005ed99197 100644 --- a/src/soc/intel/cannonlake/Kconfig +++ b/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 diff --git a/src/soc/intel/cannonlake/graphics.c b/src/soc/intel/cannonlake/graphics.c index 1487a31c9b..58f87f7474 100644 --- a/src/soc/intel/cannonlake/graphics.c +++ b/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 */ diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig index b3e9d9407e..3e0158bbab 100644 --- a/src/soc/intel/skylake/Kconfig +++ b/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 diff --git a/src/soc/intel/skylake/graphics.c b/src/soc/intel/skylake/graphics.c index 8991fa30b8..33841b3d8f 100644 --- a/src/soc/intel/skylake/graphics.c +++ b/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 */ -- cgit v1.2.3