GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drivers/intel/gma: Make libgfxinit available w/o gfxinit 

We might want to make use of libgfxinit functions without using it for
actual graphics init.

Change-Id: I29c3b19989acb678d0d447e83d38bad9d584caa9
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/31455
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Nico Huber 2019-02-18 01:16:22 +01:00 committed by Patrick Georgi
parent a02161c41e
commit fde7c317c2
3 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/device/Kconfig
View File

@ -76,7 +76,6 @@ config MAINBOARD_USE_LIBGFXINIT
depends on MAINBOARD_HAS_LIBGFXINIT depends on MAINBOARD_HAS_LIBGFXINIT
select HAVE_VGA_TEXT_FRAMEBUFFER select HAVE_VGA_TEXT_FRAMEBUFFER
select HAVE_LINEAR_FRAMEBUFFER select HAVE_LINEAR_FRAMEBUFFER
select RAMSTAGE_LIBHWBASE
select VGA if VGA_TEXT_FRAMEBUFFER select VGA if VGA_TEXT_FRAMEBUFFER
help help
Use the SPARK library `libgfxinit` for the native graphics Use the SPARK library `libgfxinit` for the native graphics

25
src/drivers/intel/gma/Kconfig
View File

@ -69,7 +69,20 @@ config GFX_GMA
|| NORTHBRIDGE_INTEL_NEHALEM || NORTHBRIDGE_INTEL_SANDYBRIDGE \ || NORTHBRIDGE_INTEL_NEHALEM || NORTHBRIDGE_INTEL_SANDYBRIDGE \
|| NORTHBRIDGE_INTEL_IVYBRIDGE || NORTHBRIDGE_INTEL_HASWELL \ || NORTHBRIDGE_INTEL_IVYBRIDGE || NORTHBRIDGE_INTEL_HASWELL \
|| SOC_INTEL_BROADWELL || SOC_INTEL_SKYLAKE || SOC_INTEL_APOLLOLAKE || SOC_INTEL_BROADWELL || SOC_INTEL_SKYLAKE || SOC_INTEL_APOLLOLAKE
depends on MAINBOARD_HAS_LIBGFXINIT depends on MAINBOARD_USE_LIBGFXINIT
select RAMSTAGE_LIBHWBASE
config GFX_GMA_INTERNAL_IS_EDP
bool
depends on GFX_GMA || MAINBOARD_HAS_LIBGFXINIT
default n if GFX_GMA_INTERNAL_IS_LVDS
default y
config GFX_GMA_INTERNAL_IS_LVDS
bool
depends on GFX_GMA || MAINBOARD_HAS_LIBGFXINIT
default y if NORTHBRIDGE_INTEL_GM45 || NORTHBRIDGE_INTEL_NEHALEM
default n
if GFX_GMA if GFX_GMA
@ -89,16 +102,6 @@ config GFX_GMA_CPU_VARIANT
default "ULT" if (SOC_INTEL_SKYLAKE && !SKYLAKE_SOC_PCH_H) || SOC_INTEL_BROADWELL || NORTHBRIDGE_INTEL_HASWELL default "ULT" if (SOC_INTEL_SKYLAKE && !SKYLAKE_SOC_PCH_H) || SOC_INTEL_BROADWELL || NORTHBRIDGE_INTEL_HASWELL
default "Normal" default "Normal"
config GFX_GMA_INTERNAL_IS_EDP
bool
default n if GFX_GMA_INTERNAL_IS_LVDS
default y
config GFX_GMA_INTERNAL_IS_LVDS
bool
default y if NORTHBRIDGE_INTEL_GM45 || NORTHBRIDGE_INTEL_NEHALEM
default n
config GFX_GMA_INTERNAL_PORT config GFX_GMA_INTERNAL_PORT
string string
default "DP" if GFX_GMA_INTERNAL_IS_EDP default "DP" if GFX_GMA_INTERNAL_IS_EDP

10
src/drivers/intel/gma/Makefile.inc
View File

@ -33,7 +33,7 @@ ifeq ($(CONFIG_INTEL_GMA_ADD_VBT),y)
$(call add_vbt_to_cbfs, vbt.bin, $(call strip_quotes,$(CONFIG_INTEL_GMA_VBT_FILE))) $(call add_vbt_to_cbfs, vbt.bin, $(call strip_quotes,$(CONFIG_INTEL_GMA_VBT_FILE)))
endif endif
ifeq ($(CONFIG_MAINBOARD_USE_LIBGFXINIT),y) ifeq ($(CONFIG_GFX_GMA),y)
$(call add-special-class,gfxinit) $(call add-special-class,gfxinit)
gfxinit-handler = $(eval ramstage-srcs += $(1)$(2)) gfxinit-handler = $(eval ramstage-srcs += $(1)$(2))
@ -50,11 +50,11 @@ CONFIG_GFX_GMA_DEFAULT_MMIO := 0 # dummy, will be overwritten at runtime
subdirs-y += ../../../../3rdparty/libgfxinit subdirs-y += ../../../../3rdparty/libgfxinit
ramstage-y += gma.ads ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma.ads
ifeq ($(CONFIG_LINEAR_FRAMEBUFFER),y) ifeq ($(CONFIG_LINEAR_FRAMEBUFFER),y)
ramstage-y += hires_fb/gma.adb ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += hires_fb/gma.adb
else else
ramstage-y += text_fb/gma.adb ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += text_fb/gma.adb
endif endif
endif # CONFIG_MAINBOARD_USE_LIBGFXINIT endif # CONFIG_GFX_GMA