<p>Patrick Rudolph has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/20619">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Kconfig: Move and rename ADD_VBT_DATA_FILE<br><br>Move ADD_VBT_DATA_FILE to "Devices" menu and rename it to<br>INTEL_ADD_VBT_DATA_FILE.<br>Depend on Intel platforms to avoid confusing users of non-Intel platforms.<br><br>The Intel GMA driver will use the vbt.bin, if present, to fill the<br>ACPI OpRegion.<br><br>Change-Id: I688bac339c32e9c856642a0f4bd5929beef06409<br>Signed-off-by: Patrick Rudolph <siro@das-labor.org><br>---<br>M src/device/Kconfig<br>M src/drivers/intel/fsp1_1/Kconfig<br>M src/drivers/intel/fsp1_1/Makefile.inc<br>M src/drivers/intel/gma/Makefile.inc<br>M src/soc/intel/apollolake/Kconfig<br>M src/soc/intel/common/Kconfig<br>M src/soc/intel/common/Makefile.inc<br>M src/soc/intel/skylake/Kconfig<br>M src/soc/intel/skylake/igd.c<br>9 files changed, 24 insertions(+), 23 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/19/20619/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/device/Kconfig b/src/device/Kconfig<br>index a5b8247..7d8b805 100644<br>--- a/src/device/Kconfig<br>+++ b/src/device/Kconfig<br>@@ -591,6 +591,21 @@<br> <br> Under GNU/Linux you can run `lspci -nn` to list the IDs of your PCI devices.<br> <br>+# Used by drivers/intel/gma , drivers/intel/fsp1_1 and Intel SOC<br>+config INTEL_ADD_VBT_DATA_FILE<br>+ depends on SOC_INTEL_COMMON || CPU_INTEL_COMMON<br>+ bool "Add a Video Bios Table (VBT) binary to CBFS"<br>+ help<br>+ Add a VBT file data file to CBFS. The VBT describes the integrated<br>+ GPU and connections, and is needed by FSP in order to initialize the<br>+ display.<br>+<br>+config INTEL_VBT_FILE<br>+ string "VBT binary path and filename"<br>+ depends on INTEL_ADD_VBT_DATA_FILE<br>+ help<br>+ The path and filename of the VBT binary.<br>+<br> config INTEL_MBI<br> bool "Add an MBI image"<br> depends on NORTHBRIDGE_INTEL_I82830<br>diff --git a/src/drivers/intel/fsp1_1/Kconfig b/src/drivers/intel/fsp1_1/Kconfig<br>index ab94a0a..77a2823 100644<br>--- a/src/drivers/intel/fsp1_1/Kconfig<br>+++ b/src/drivers/intel/fsp1_1/Kconfig<br>@@ -16,7 +16,7 @@<br> config PLATFORM_USES_FSP1_1<br> bool<br> select UEFI_2_4_BINDING<br>- select ADD_VBT_DATA_FILE if RUN_FSP_GOP<br>+ select INTEL_ADD_VBT_DATA_FILE if RUN_FSP_GOP<br> help<br> Does the code require the Intel Firmware Support Package?<br> <br>diff --git a/src/drivers/intel/fsp1_1/Makefile.inc b/src/drivers/intel/fsp1_1/Makefile.inc<br>index 22d24ee..a0ea63b 100644<br>--- a/src/drivers/intel/fsp1_1/Makefile.inc<br>+++ b/src/drivers/intel/fsp1_1/Makefile.inc<br>@@ -38,7 +38,7 @@<br> ramstage-y += hob.c<br> ramstage-y += ramstage.c<br> ramstage-y += stage_cache.c<br>-ramstage-$(CONFIG_ADD_VBT_DATA_FILE) += vbt.c<br>+ramstage-$(CONFIG_INTEL_ADD_VBT_DATA_FILE) += vbt.c<br> ramstage-$(CONFIG_MMA) += mma_core.c<br> <br> CPPFLAGS_common += -Isrc/drivers/intel/fsp1_1/include<br>diff --git a/src/drivers/intel/gma/Makefile.inc b/src/drivers/intel/gma/Makefile.inc<br>index 50494e1..0eb270a 100644<br>--- a/src/drivers/intel/gma/Makefile.inc<br>+++ b/src/drivers/intel/gma/Makefile.inc<br>@@ -21,6 +21,9 @@<br> ramstage-$(CONFIG_INTEL_GMA_ACPI) += acpi.c<br> ramstage-$(CONFIG_INTEL_GMA_ACPI) += opregion.c<br> <br>+cbfs-files-$(CONFIG_INTEL_ADD_VBT_DATA_FILE) += vbt.bin<br>+vbt.bin-file := $(call strip_quotes,$(CONFIG_INTEL_VBT_FILE))<br>+vbt.bin-type := raw<br> <br> ifeq ($(CONFIG_MAINBOARD_USE_LIBGFXINIT),y)<br> <br>diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig<br>index fdbd6d7..11c16b3 100644<br>--- a/src/soc/intel/apollolake/Kconfig<br>+++ b/src/soc/intel/apollolake/Kconfig<br>@@ -84,7 +84,7 @@<br> select SOC_INTEL_COMMON_GFX_OPREGION<br> select SOC_INTEL_COMMON_BLOCK<br> select SOC_INTEL_COMMON_BLOCK_CSE<br>- select ADD_VBT_DATA_FILE if RUN_FSP_GOP<br>+ select INTEL_ADD_VBT_DATA_FILE if RUN_FSP_GOP<br> select HAVE_FSP_GOP<br> <br> config CHROMEOS<br>diff --git a/src/soc/intel/common/Kconfig b/src/soc/intel/common/Kconfig<br>index 1e3afe9..44c5bf7 100644<br>--- a/src/soc/intel/common/Kconfig<br>+++ b/src/soc/intel/common/Kconfig<br>@@ -102,19 +102,6 @@<br> default "3rdparty/blobs/soc/intel/kabylake/mma-blobs" if SOC_INTEL_KABYLAKE<br> default "3rdparty/blobs/soc/intel/skylake/mma-blobs" if SOC_INTEL_SKYLAKE<br> <br>-config ADD_VBT_DATA_FILE<br>- bool "Add a Video Bios Table (VBT) binary to CBFS"<br>- help<br>- Add a VBT file data file to CBFS. The VBT describes the integrated<br>- GPU and connections, and is needed by FSP in order to initialize the<br>- display.<br>-<br>-config VBT_FILE<br>- string "VBT binary path and filename"<br>- depends on ADD_VBT_DATA_FILE<br>- help<br>- The path and filename of the VBT binary.<br>-<br> config SOC_INTEL_COMMON_GFX_OPREGION<br> bool<br> default n<br>diff --git a/src/soc/intel/common/Makefile.inc b/src/soc/intel/common/Makefile.inc<br>index 1109775..cd94258 100644<br>--- a/src/soc/intel/common/Makefile.inc<br>+++ b/src/soc/intel/common/Makefile.inc<br>@@ -92,8 +92,4 @@<br> <br> endif<br> <br>-cbfs-files-$(CONFIG_ADD_VBT_DATA_FILE) += vbt.bin<br>-vbt.bin-file := $(call strip_quotes,$(CONFIG_VBT_FILE))<br>-vbt.bin-type := raw<br>-<br> endif<br>diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig<br>index c558886..67f8d08 100644<br>--- a/src/soc/intel/skylake/Kconfig<br>+++ b/src/soc/intel/skylake/Kconfig<br>@@ -92,7 +92,7 @@<br> def_bool y<br> depends on MAINBOARD_USES_FSP2_0<br> select PLATFORM_USES_FSP2_0<br>- select ADD_VBT_DATA_FILE if RUN_FSP_GOP<br>+ select INTEL_ADD_VBT_DATA_FILE if RUN_FSP_GOP<br> select SOC_INTEL_COMMON_GFX_OPREGION<br> select POSTCAR_CONSOLE<br> select POSTCAR_STAGE<br>diff --git a/src/soc/intel/skylake/igd.c b/src/soc/intel/skylake/igd.c<br>index 7aa8db7..bb3bb7e 100644<br>--- a/src/soc/intel/skylake/igd.c<br>+++ b/src/soc/intel/skylake/igd.c<br>@@ -85,7 +85,7 @@<br> gtt_write(DDI_BUF_CTL_A, ddi_buf_ctl);<br> }<br> <br>- if (IS_ENABLED(CONFIG_ADD_VBT_DATA_FILE))<br>+ if (IS_ENABLED(CONFIG_INTEL_ADD_VBT_DATA_FILE))<br> return;<br> <br> /* IGD needs to be Bus Master */<br>@@ -159,7 +159,7 @@<br> igd_opregion_t *opregion;<br> <br> /* If GOP is not used, exit here */<br>- if (!IS_ENABLED(CONFIG_ADD_VBT_DATA_FILE))<br>+ if (!IS_ENABLED(CONFIG_INTEL_ADD_VBT_DATA_FILE))<br> return current;<br> <br> /* If IGD is disabled, exit here */<br></pre><p>To view, visit <a href="https://review.coreboot.org/20619">change 20619</a>. To unsubscribe, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/20619"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I688bac339c32e9c856642a0f4bd5929beef06409 </div>
<div style="display:none"> Gerrit-Change-Number: 20619 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Patrick Rudolph <siro@das-labor.org> </div>