diff options
Diffstat (limited to 'src/soc/intel')
| -rw-r--r-- | src/soc/intel/apollolake/Kconfig | 2 | ||||
| -rw-r--r-- | src/soc/intel/common/Kconfig | 13 | ||||
| -rw-r--r-- | src/soc/intel/common/Makefile.inc | 4 | ||||
| -rw-r--r-- | src/soc/intel/skylake/Kconfig | 2 | ||||
| -rw-r--r-- | src/soc/intel/skylake/igd.c | 4 |
5 files changed, 4 insertions, 21 deletions
diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig index 5ff328b522..a3b458d489 100644 --- a/src/soc/intel/apollolake/Kconfig +++ b/src/soc/intel/apollolake/Kconfig @@ -93,7 +93,7 @@ config CPU_SPECIFIC_OPTIONS select SOC_INTEL_COMMON_GFX_OPREGION select SOC_INTEL_COMMON_BLOCK select SOC_INTEL_COMMON_BLOCK_CSE - select ADD_VBT_DATA_FILE if RUN_FSP_GOP + select INTEL_GMA_ADD_VBT_DATA_FILE if RUN_FSP_GOP select HAVE_FSP_GOP config CHROMEOS diff --git a/src/soc/intel/common/Kconfig b/src/soc/intel/common/Kconfig index 1e3afe91af..44c5bf75fe 100644 --- a/src/soc/intel/common/Kconfig +++ b/src/soc/intel/common/Kconfig @@ -102,19 +102,6 @@ config MMA_BLOBS_PATH default "3rdparty/blobs/soc/intel/kabylake/mma-blobs" if SOC_INTEL_KABYLAKE default "3rdparty/blobs/soc/intel/skylake/mma-blobs" if SOC_INTEL_SKYLAKE -config ADD_VBT_DATA_FILE - bool "Add a Video Bios Table (VBT) binary to CBFS" - help - Add a VBT file data file to CBFS. The VBT describes the integrated - GPU and connections, and is needed by FSP in order to initialize the - display. - -config VBT_FILE - string "VBT binary path and filename" - depends on ADD_VBT_DATA_FILE - help - The path and filename of the VBT binary. - config SOC_INTEL_COMMON_GFX_OPREGION bool default n diff --git a/src/soc/intel/common/Makefile.inc b/src/soc/intel/common/Makefile.inc index 110977585d..cd942580a6 100644 --- a/src/soc/intel/common/Makefile.inc +++ b/src/soc/intel/common/Makefile.inc @@ -92,8 +92,4 @@ $(foreach mma_test, $(MMA_TEST_CONFIG_NAMES),\ endif -cbfs-files-$(CONFIG_ADD_VBT_DATA_FILE) += vbt.bin -vbt.bin-file := $(call strip_quotes,$(CONFIG_VBT_FILE)) -vbt.bin-type := raw - endif 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 */ |