diff options
| -rw-r--r-- | src/device/Kconfig | 14 | ||||
| -rw-r--r-- | src/drivers/intel/fsp1_1/Kconfig | 2 | ||||
| -rw-r--r-- | src/drivers/intel/fsp1_1/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/drivers/intel/gma/Makefile.inc | 4 | ||||
| -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 |
9 files changed, 24 insertions, 23 deletions
diff --git a/src/device/Kconfig b/src/device/Kconfig index a5b8247cde3c..28298d55d30a 100644 --- a/src/device/Kconfig +++ b/src/device/Kconfig @@ -591,6 +591,20 @@ config VGA_BIOS_ID Under GNU/Linux you can run `lspci -nn` to list the IDs of your PCI devices. +config INTEL_GMA_ADD_VBT_DATA_FILE + depends on SOC_INTEL_COMMON || CPU_INTEL_COMMON + bool "Add a Video Bios Table (VBT) binary to CBFS" + 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 + FSP and the OS driver in order to initialize the display. + +config INTEL_GMA_VBT_FILE + string "VBT binary path and filename" + depends on INTEL_GMA_ADD_VBT_DATA_FILE + help + The path and filename of the VBT binary. + config INTEL_MBI bool "Add an MBI image" depends on NORTHBRIDGE_INTEL_I82830 diff --git a/src/drivers/intel/fsp1_1/Kconfig b/src/drivers/intel/fsp1_1/Kconfig index ab94a0a8ec91..40dcaf84fc94 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 ADD_VBT_DATA_FILE if RUN_FSP_GOP + select INTEL_GMA_ADD_VBT_DATA_FILE 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 22d24ee0802a..80af1937bdfa 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_ADD_VBT_DATA_FILE) += vbt.c +ramstage-$(CONFIG_INTEL_GMA_ADD_VBT_DATA_FILE) += 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 940d15a03802..ab799ef99a7f 100644 --- a/src/drivers/intel/gma/Makefile.inc +++ b/src/drivers/intel/gma/Makefile.inc @@ -21,6 +21,10 @@ 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 +vbt.bin-file := $(call strip_quotes,$(CONFIG_INTEL_GMA_VBT_FILE)) +vbt.bin-type := raw + ifeq ($(CONFIG_MAINBOARD_USE_LIBGFXINIT),y) $(call add-special-class,gfxinit) diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig index 5ff328b52277..a3b458d48992 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 1e3afe91af4c..44c5bf75feac 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 110977585d1b..cd942580a617 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 4927eac38c12..b045486491e6 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 62bcf4226701..e1d5bff73fae 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 */ |