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/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 +- 6 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/soc/intel') 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