[coreboot-gerrit] Change in coreboot[master]: Kconfig: Move and rename ADD_VBT_DATA_FILE
Patrick Rudolph (Code Review)
gerrit at coreboot.org
Mon Jul 17 20:04:23 CEST 2017
Patrick Rudolph has uploaded this change for review. ( https://review.coreboot.org/20619
Change subject: Kconfig: Move and rename ADD_VBT_DATA_FILE
......................................................................
Kconfig: Move and rename ADD_VBT_DATA_FILE
Move ADD_VBT_DATA_FILE to "Devices" menu and rename it to
INTEL_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 at das-labor.org>
---
M src/device/Kconfig
M src/drivers/intel/fsp1_1/Kconfig
M src/drivers/intel/fsp1_1/Makefile.inc
M src/drivers/intel/gma/Makefile.inc
M src/soc/intel/apollolake/Kconfig
M src/soc/intel/common/Kconfig
M src/soc/intel/common/Makefile.inc
M src/soc/intel/skylake/Kconfig
M src/soc/intel/skylake/igd.c
9 files changed, 24 insertions(+), 23 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/19/20619/1
diff --git a/src/device/Kconfig b/src/device/Kconfig
index a5b8247..7d8b805 100644
--- a/src/device/Kconfig
+++ b/src/device/Kconfig
@@ -591,6 +591,21 @@
Under GNU/Linux you can run `lspci -nn` to list the IDs of your PCI devices.
+# Used by drivers/intel/gma , drivers/intel/fsp1_1 and Intel SOC
+config INTEL_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 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 INTEL_VBT_FILE
+ string "VBT binary path and filename"
+ depends on INTEL_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 ab94a0a..77a2823 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_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 22d24ee..a0ea63b 100644
--- a/src/drivers/intel/fsp1_1/Makefile.inc
+++ b/src/drivers/intel/fsp1_1/Makefile.inc
@@ -38,7 +38,7 @@
ramstage-y += hob.c
ramstage-y += ramstage.c
ramstage-y += stage_cache.c
-ramstage-$(CONFIG_ADD_VBT_DATA_FILE) += vbt.c
+ramstage-$(CONFIG_INTEL_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 50494e1..0eb270a 100644
--- a/src/drivers/intel/gma/Makefile.inc
+++ b/src/drivers/intel/gma/Makefile.inc
@@ -21,6 +21,9 @@
ramstage-$(CONFIG_INTEL_GMA_ACPI) += acpi.c
ramstage-$(CONFIG_INTEL_GMA_ACPI) += opregion.c
+cbfs-files-$(CONFIG_INTEL_ADD_VBT_DATA_FILE) += vbt.bin
+vbt.bin-file := $(call strip_quotes,$(CONFIG_INTEL_VBT_FILE))
+vbt.bin-type := raw
ifeq ($(CONFIG_MAINBOARD_USE_LIBGFXINIT),y)
diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig
index fdbd6d7..11c16b3 100644
--- a/src/soc/intel/apollolake/Kconfig
+++ b/src/soc/intel/apollolake/Kconfig
@@ -84,7 +84,7 @@
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_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 1e3afe9..44c5bf7 100644
--- a/src/soc/intel/common/Kconfig
+++ b/src/soc/intel/common/Kconfig
@@ -102,19 +102,6 @@
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 1109775..cd94258 100644
--- a/src/soc/intel/common/Makefile.inc
+++ b/src/soc/intel/common/Makefile.inc
@@ -92,8 +92,4 @@
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 c558886..67f8d08 100644
--- a/src/soc/intel/skylake/Kconfig
+++ b/src/soc/intel/skylake/Kconfig
@@ -92,7 +92,7 @@
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_ADD_VBT_DATA_FILE if RUN_FSP_GOP
select SOC_INTEL_COMMON_GFX_OPREGION
select POSTCAR_CONSOLE
select POSTCAR_STAGE
diff --git a/src/soc/intel/skylake/igd.c b/src/soc/intel/skylake/igd.c
index 7aa8db7..bb3bb7e 100644
--- a/src/soc/intel/skylake/igd.c
+++ b/src/soc/intel/skylake/igd.c
@@ -85,7 +85,7 @@
gtt_write(DDI_BUF_CTL_A, ddi_buf_ctl);
}
- if (IS_ENABLED(CONFIG_ADD_VBT_DATA_FILE))
+ if (IS_ENABLED(CONFIG_INTEL_ADD_VBT_DATA_FILE))
return;
/* IGD needs to be Bus Master */
@@ -159,7 +159,7 @@
igd_opregion_t *opregion;
/* If GOP is not used, exit here */
- if (!IS_ENABLED(CONFIG_ADD_VBT_DATA_FILE))
+ if (!IS_ENABLED(CONFIG_INTEL_ADD_VBT_DATA_FILE))
return current;
/* If IGD is disabled, exit here */
--
To view, visit https://review.coreboot.org/20619
To unsubscribe, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I688bac339c32e9c856642a0f4bd5929beef06409
Gerrit-Change-Number: 20619
Gerrit-PatchSet: 1
Gerrit-Owner: Patrick Rudolph <siro at das-labor.org>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20170717/de66ab59/attachment.html>
More information about the coreboot-gerrit
mailing list