aboutsummaryrefslogtreecommitdiff
path: root/src/soc/intel/braswell/Makefile.inc
diff options
context:
space:
mode:
authorNico Huber <nico.huber@secunet.com>2017-05-22 15:58:03 +0200
committerNico Huber <nico.h@gmx.de>2017-06-08 14:58:29 +0200
commit2e7f6ccafc3e633ed9001b3c3863253ee0630429 (patch)
treef8e8ff0b026fe9adf97b7cdc135665044f614b5a /src/soc/intel/braswell/Makefile.inc
parentd4ebeaf475dc1137f489f12ffa4e55d914238662 (diff)
fsp/gop: Add running the GOP to the choice of gfx init
The new config choice is called RUN_FSP_GOP. Some things had to happen on the road: * Drop confusing config GOP_SUPPORT, * Add HAVE_FSP_GOP to chipsets that support it, * Make running the GOP an option for FSP2.0 by returning 0 in random VBT getters. Change-Id: I92f88424004a4c0abf1f39cc02e2a146bddbcedf Signed-off-by: Nico Huber <nico.huber@secunet.com> Reviewed-on: https://review.coreboot.org/19815 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/soc/intel/braswell/Makefile.inc')
-rw-r--r--src/soc/intel/braswell/Makefile.inc5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/soc/intel/braswell/Makefile.inc b/src/soc/intel/braswell/Makefile.inc
index abd64a5ec0..88d024243b 100644
--- a/src/soc/intel/braswell/Makefile.inc
+++ b/src/soc/intel/braswell/Makefile.inc
@@ -20,7 +20,7 @@ ramstage-y += cpu.c
ramstage-$(CONFIG_ELOG) += elog.c
ramstage-y += emmc.c
ramstage-y += gpio.c
-ifeq ($(CONFIG_GOP_SUPPORT),n)
+ifneq ($(CONFIG_RUN_FSP_GOP),y)
ramstage-y += gfx.c
endif
ramstage-y += gpio_support.c
@@ -59,7 +59,6 @@ CPPFLAGS_common += -I$(src)/vendorcode/intel/fsp/fsp1_1/braswell
CPPFLAGS_common += -I3rdparty/blobs/mainboard/$(MAINBOARDDIR)
-ifneq ($(CONFIG_GOP_SUPPORT),y)
ifneq ($(CONFIG_VGA_BIOS_FILE),)
#we will assume that the vbios names will remain as they are now: vgabios.bin and vgabios_c0.bin
BRASWELL_C0_VBIOS= $(subst .bin,_c0.bin,$(call strip_quotes,$(CONFIG_VGA_BIOS_FILE)))
@@ -67,8 +66,6 @@ BRASWELL_C0_VBIOS= $(subst .bin,_c0.bin,$(call strip_quotes,$(CONFIG_VGA_BIOS_FI
cbfs-files-$(CONFIG_VGA_BIOS) += pci8086,22b1.rom
pci8086,22b1.rom-file := $(BRASWELL_C0_VBIOS)
pci8086,22b1.rom-type := optionrom
-
-endif # ifneq ($(CONFIG_GOP_SUPPORT),y)
endif # ifneq ($(CONFIG_VGA_BIOS_FILE),)
endif # ifeq ($(CONFIG_SOC_INTEL_BRASWELL),y)