From 660de34bbf0c9843120ffa2e861d26718e3205e3 Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Tue, 13 Jun 2017 16:54:00 -0500 Subject: drivers/fsp1_1: decouple VBT from execution of GOP driver Commit 2e7f6cc introduced the 'no graphics init' option for FSP 1.1 SoCs using a GOP driver to init the display, but selecting that option while including a VBT breaks compilation for Braswell and Skylake devices because the VBT and GOP driver are intertwined. This patch decouples the VBT from the GOP driver execution, allowing the 'no graphics init' option to compile (and work) properly when CONFIG_ADD_VBT_DATA_FILE=y. Change-Id: Ifbcf32805177c290c4781b32bbcca679bcb0c297 Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/20210 Reviewed-by: Nico Huber Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Youness Alaoui --- src/drivers/intel/fsp1_1/Makefile.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/drivers/intel/fsp1_1/Makefile.inc') diff --git a/src/drivers/intel/fsp1_1/Makefile.inc b/src/drivers/intel/fsp1_1/Makefile.inc index d0e2856c37..22d24ee080 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_RUN_FSP_GOP) += vbt.c +ramstage-$(CONFIG_ADD_VBT_DATA_FILE) += vbt.c ramstage-$(CONFIG_MMA) += mma_core.c CPPFLAGS_common += -Isrc/drivers/intel/fsp1_1/include -- cgit v1.2.3