summaryrefslogtreecommitdiff
path: root/src/soc/intel/skylake
diff options
context:
space:
mode:
authorPatrick Rudolph <siro@das-labor.org>2017-07-17 19:53:56 +0200
committerPatrick Rudolph <siro@das-labor.org>2017-09-04 15:34:10 +0000
commit4c17098fafddefbaa1e7ff5c5ceb5028aa127f00 (patch)
treee9bb974fd6c8757e4a745ec900b102dc8a9e7b65 /src/soc/intel/skylake
parent1918c81d65ecfdcb64fa811debd919b2a25cf47d (diff)
downloadcoreboot-4c17098fafddefbaa1e7ff5c5ceb5028aa127f00.tar.xz
Kconfig: Move and rename ADD_VBT_DATA_FILE
Move ADD_VBT_DATA_FILE to "Devices" menu and rename it to INTEL_GMA_ADD_VBT_DATA_FILE. Depend on Intel platforms to avoid confusing users of non-Intel platforms. The Intel GMA driver will use the vbt.bin, if present, to fill the ACPI OpRegion. Change-Id: I688bac339c32e9c856642a0f4bd5929beef06409 Signed-off-by: Patrick Rudolph <siro@das-labor.org> Reviewed-on: https://review.coreboot.org/20619 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Matt DeVillier <matt.devillier@gmail.com> Reviewed-by: Nico Huber <nico.h@gmx.de>
Diffstat (limited to 'src/soc/intel/skylake')
-rw-r--r--src/soc/intel/skylake/Kconfig2
-rw-r--r--src/soc/intel/skylake/igd.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig
index 4927eac38c..b045486491 100644
--- a/src/soc/intel/skylake/Kconfig
+++ b/src/soc/intel/skylake/Kconfig
@@ -93,7 +93,7 @@ config USE_FSP2_0_DRIVER
def_bool y
depends on MAINBOARD_USES_FSP2_0
select PLATFORM_USES_FSP2_0
- select ADD_VBT_DATA_FILE if RUN_FSP_GOP
+ select INTEL_GMA_ADD_VBT_DATA_FILE if RUN_FSP_GOP
select POSTCAR_CONSOLE
select POSTCAR_STAGE
diff --git a/src/soc/intel/skylake/igd.c b/src/soc/intel/skylake/igd.c
index 62bcf42267..e1d5bff73f 100644
--- a/src/soc/intel/skylake/igd.c
+++ b/src/soc/intel/skylake/igd.c
@@ -91,7 +91,7 @@ static void igd_init(struct device *dev)
gtt_write(DDI_BUF_CTL_A, ddi_buf_ctl);
}
- if (IS_ENABLED(CONFIG_ADD_VBT_DATA_FILE))
+ if (IS_ENABLED(CONFIG_INTEL_GMA_ADD_VBT_DATA_FILE))
return;
/* IGD needs to be Bus Master */
@@ -141,7 +141,7 @@ static unsigned long write_acpi_igd_opregion(device_t device,
igd_opregion_t *opregion;
/* If GOP is not used, exit here */
- if (!IS_ENABLED(CONFIG_ADD_VBT_DATA_FILE))
+ if (!IS_ENABLED(CONFIG_INTEL_GMA_ADD_VBT_DATA_FILE))
return current;
/* If IGD is disabled, exit here */