From a459a8a145be0413d540d6cb62f9a1b6ead3175a Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Sun, 30 Apr 2017 08:26:27 +0200 Subject: lib/edid.c: Allow use of when not NGI Change-Id: I8709e3e61686979137b08d24efad903700d18e0b Signed-off-by: Arthur Heymans Reviewed-on: https://review.coreboot.org/19501 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber --- src/device/Kconfig | 1 + src/lib/Makefile.inc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3