diff --git a/src/drivers/intel/gma/Kconfig b/src/drivers/intel/gma/Kconfig
index bc96846213..56afedfcc8 100644
--- a/src/drivers/intel/gma/Kconfig
+++ b/src/drivers/intel/gma/Kconfig
@@ -86,8 +86,7 @@ config GFX_GMA
 		|| NORTHBRIDGE_INTEL_IRONLAKE || NORTHBRIDGE_INTEL_SANDYBRIDGE \
 		|| NORTHBRIDGE_INTEL_HASWELL || SOC_INTEL_BROADWELL \
 		|| SOC_INTEL_COMMON_SKYLAKE_BASE || SOC_INTEL_APOLLOLAKE \
-		|| SOC_INTEL_COFFEELAKE \
-		|| SOC_INTEL_WHISKEYLAKE || SOC_INTEL_COMETLAKE
+		|| SOC_INTEL_CANNONLAKE_BASE
 	depends on MAINBOARD_USE_LIBGFXINIT || INTEL_GMA_LIBGFXINIT_EDID
 	select RAMSTAGE_LIBHWBASE
 
@@ -113,9 +112,7 @@ config GFX_GMA_DYN_CPU
 config GFX_GMA_GENERATION
 	string
 	default "Broxton" if SOC_INTEL_APOLLOLAKE
-	default "Skylake" if SOC_INTEL_COMMON_SKYLAKE_BASE || \
-				SOC_INTEL_COFFEELAKE || SOC_INTEL_WHISKEYLAKE || \
-				SOC_INTEL_COMETLAKE
+	default "Skylake" if SOC_INTEL_COMMON_SKYLAKE_BASE || SOC_INTEL_CANNONLAKE_BASE
 	default "Haswell" if NORTHBRIDGE_INTEL_HASWELL || SOC_INTEL_BROADWELL
 	default "Ironlake" if NORTHBRIDGE_INTEL_IRONLAKE || NORTHBRIDGE_INTEL_SANDYBRIDGE
 	default "G45" if NORTHBRIDGE_INTEL_GM45 || NORTHBRIDGE_INTEL_X4X