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