summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur Heymans <arthur@aheymans.xyz>2017-04-30 08:26:27 +0200
committerNico Huber <nico.h@gmx.de>2017-05-03 16:16:32 +0200
commita459a8a145be0413d540d6cb62f9a1b6ead3175a (patch)
tree6797020e07e50ad1646e870c28c500b57bde98d1
parent553f7fb27c14667e7bacf31040b9d58ca74dd06d (diff)
lib/edid.c: Allow use of when not NGI
Change-Id: I8709e3e61686979137b08d24efad903700d18e0b Signed-off-by: Arthur Heymans <arthur@aheymans.xyz> Reviewed-on: https://review.coreboot.org/19501 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Nico Huber <nico.h@gmx.de>
-rw-r--r--src/device/Kconfig1
-rw-r--r--src/lib/Makefile.inc2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/device/Kconfig b/src/device/Kconfig
index 83f0f9fe5e..3dfc507490 100644
--- a/src/device/Kconfig
+++ b/src/device/Kconfig
@@ -24,6 +24,7 @@ config MAINBOARD_HAS_NATIVE_VGA_INIT
# FIXME Ugly hack to allow Z9s driver native framebuffer configuration
config NATIVE_VGA_INIT_USE_EDID
bool
+ depends on MAINBOARD_DO_NATIVE_VGA_INIT
default n if DRIVERS_XGI_Z9S || MAINBOARD_USE_LIBGFXINIT
default y if !DRIVERS_XGI_Z9S
diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc
index 8f92b291bb..55f5960103 100644
--- a/src/lib/Makefile.inc
+++ b/src/lib/Makefile.inc
@@ -130,7 +130,7 @@ ramstage-$(CONFIG_BOOTSPLASH) += jpeg.c
ramstage-$(CONFIG_TRACE) += trace.c
ramstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c
ramstage-$(CONFIG_COVERAGE) += libgcov.c
-ramstage-$(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT) += edid.c
+ramstage-y += edid.c
ramstage-y += memrange.c
ramstage-$(CONFIG_COOP_MULTITASKING) += thread.c
ramstage-$(CONFIG_TIMER_QUEUE) += timer_queue.c