diff --git a/src/mainboard/apple/macbook21/Kconfig b/src/mainboard/apple/macbook21/Kconfig
index 7ee0e1a..cbc266f 100644
--- a/src/mainboard/apple/macbook21/Kconfig
+++ b/src/mainboard/apple/macbook21/Kconfig
@@ -21,7 +21,6 @@
 	select MAINBOARD_HAS_NATIVE_VGA_INIT
 	select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG
 	select VGA
-	select INTEL_EDID
 
 config MAINBOARD_DIR
 	string
diff --git a/src/mainboard/asus/p5gc-mx/Kconfig b/src/mainboard/asus/p5gc-mx/Kconfig
index 6f6eaae..445d932 100644
--- a/src/mainboard/asus/p5gc-mx/Kconfig
+++ b/src/mainboard/asus/p5gc-mx/Kconfig
@@ -32,7 +32,6 @@
 	select BOARD_ROMSIZE_KB_512
 	select CHANNEL_XOR_RANDOMIZATION
 	select MAINBOARD_HAS_NATIVE_VGA_INIT
-	select INTEL_EDID
 
 config MAINBOARD_DIR
 	string
diff --git a/src/mainboard/getac/p470/Kconfig b/src/mainboard/getac/p470/Kconfig
index cdcd9cc..3127874 100644
--- a/src/mainboard/getac/p470/Kconfig
+++ b/src/mainboard/getac/p470/Kconfig
@@ -36,7 +36,6 @@
 	select VGA
 	select MAINBOARD_HAS_NATIVE_VGA_INIT
 	select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG
-	select INTEL_EDID
 	select INTEL_INT15
 
 config MAINBOARD_DIR
diff --git a/src/mainboard/gigabyte/ga-945gcm-s2l/Kconfig b/src/mainboard/gigabyte/ga-945gcm-s2l/Kconfig
index 0ac060f..e1ac366 100644
--- a/src/mainboard/gigabyte/ga-945gcm-s2l/Kconfig
+++ b/src/mainboard/gigabyte/ga-945gcm-s2l/Kconfig
@@ -31,7 +31,6 @@
 	select BOARD_ROMSIZE_KB_512
 	select CHANNEL_XOR_RANDOMIZATION
 	select MAINBOARD_HAS_NATIVE_VGA_INIT
-	select INTEL_EDID
 	select REALTEK_8168_RESET if BOARD_GIGABYTE_GA_945GCM_S2L
 
 config MAINBOARD_DIR
diff --git a/src/mainboard/intel/d945gclf/Kconfig b/src/mainboard/intel/d945gclf/Kconfig
index 4887dbb..fd500d4 100644
--- a/src/mainboard/intel/d945gclf/Kconfig
+++ b/src/mainboard/intel/d945gclf/Kconfig
@@ -30,7 +30,6 @@
 	select BOARD_ROMSIZE_KB_512
 	select CHANNEL_XOR_RANDOMIZATION
 	select MAINBOARD_HAS_NATIVE_VGA_INIT
-	select INTEL_EDID
 
 config MAINBOARD_DIR
 	string
diff --git a/src/mainboard/lenovo/t60/Kconfig b/src/mainboard/lenovo/t60/Kconfig
index 289c06a..b2b2c1c 100644
--- a/src/mainboard/lenovo/t60/Kconfig
+++ b/src/mainboard/lenovo/t60/Kconfig
@@ -24,7 +24,6 @@
 	select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG
 	select H8_DOCK_EARLY_INIT
 	select HAVE_CMOS_DEFAULT
-	select INTEL_EDID
 
 config MAINBOARD_DIR
 	string
diff --git a/src/mainboard/lenovo/x60/Kconfig b/src/mainboard/lenovo/x60/Kconfig
index 7667a75..316e03f 100644
--- a/src/mainboard/lenovo/x60/Kconfig
+++ b/src/mainboard/lenovo/x60/Kconfig
@@ -27,7 +27,6 @@
 	select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG
 	select H8_DOCK_EARLY_INIT
 	select DRIVERS_LENOVO_WACOM
-	select INTEL_EDID
 
 config MAINBOARD_DIR
 	string
diff --git a/src/northbridge/intel/i945/Kconfig b/src/northbridge/intel/i945/Kconfig
index 18e90b6..98ed630 100644
--- a/src/northbridge/intel/i945/Kconfig
+++ b/src/northbridge/intel/i945/Kconfig
@@ -26,6 +26,7 @@
 	select INTEL_GMA_ACPI
 	select INTEL_GMA_SSC_ALTERNATE_REF
 	select RELOCATABLE_RAMSTAGE
+	select INTEL_EDID
 
 config NORTHBRIDGE_INTEL_SUBTYPE_I945GC
 	def_bool n