From 4c17098fafddefbaa1e7ff5c5ceb5028aa127f00 Mon Sep 17 00:00:00 2001 From: Patrick Rudolph Date: Mon, 17 Jul 2017 19:53:56 +0200 Subject: 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 Reviewed-on: https://review.coreboot.org/20619 Tested-by: build bot (Jenkins) Reviewed-by: Matt DeVillier Reviewed-by: Nico Huber --- src/drivers/intel/fsp1_1/Kconfig | 2 +- src/drivers/intel/fsp1_1/Makefile.inc | 2 +- src/drivers/intel/gma/Makefile.inc | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) (limited to 'src/drivers/intel') diff --git a/src/drivers/intel/fsp1_1/Kconfig b/src/drivers/intel/fsp1_1/Kconfig index ab94a0a8ec..40dcaf84fc 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 22d24ee080..80af1937bd 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 940d15a038..ab799ef99a 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) -- cgit v1.2.3