diff --git a/3rdparty/libgfxinit b/3rdparty/libgfxinit
index f70eddafbc..b3b9fa34bb 160000
--- a/3rdparty/libgfxinit
+++ b/3rdparty/libgfxinit
@@ -1 +1 @@
-Subproject commit f70eddafbc2c6045a14e2f8bbb3273ee738fbaf7
+Subproject commit b3b9fa34bb99d33d0fc6a69c64966a71cebd5bd6
diff --git a/src/drivers/intel/gma/Kconfig b/src/drivers/intel/gma/Kconfig
index 4f897fab13..bf7e4b65fe 100644
--- a/src/drivers/intel/gma/Kconfig
+++ b/src/drivers/intel/gma/Kconfig
@@ -86,22 +86,19 @@ config GFX_GMA_INTERNAL_IS_LVDS
 
 if GFX_GMA
 
-config GFX_GMA_CPU
+config GFX_GMA_DYN_CPU
+	def_bool y
+	help
+	  Activates runtime CPU detection in libgfxinit.
+
+config GFX_GMA_GENERATION
 	string
 	default "Broxton" if SOC_INTEL_APOLLOLAKE
 	default "Skylake" if SOC_INTEL_SKYLAKE
-	default "Broadwell" if SOC_INTEL_BROADWELL
-	default "Haswell" if NORTHBRIDGE_INTEL_HASWELL
-	default "Ivybridge" if NORTHBRIDGE_INTEL_IVYBRIDGE
-	default "Sandybridge" if NORTHBRIDGE_INTEL_SANDYBRIDGE
-	default "Ironlake" if NORTHBRIDGE_INTEL_NEHALEM
+	default "Haswell" if NORTHBRIDGE_INTEL_HASWELL || SOC_INTEL_BROADWELL
+	default "Ironlake" if NORTHBRIDGE_INTEL_NEHALEM || NORTHBRIDGE_INTEL_SANDYBRIDGE || NORTHBRIDGE_INTEL_IVYBRIDGE
 	default "G45" if NORTHBRIDGE_INTEL_GM45 || NORTHBRIDGE_INTEL_X4X
 
-config GFX_GMA_CPU_VARIANT
-	string
-	default "ULT" if (SOC_INTEL_SKYLAKE && !SKYLAKE_SOC_PCH_H) || SOC_INTEL_BROADWELL || NORTHBRIDGE_INTEL_HASWELL
-	default "Normal"
-
 config GFX_GMA_INTERNAL_PORT
 	string
 	default "DP" if GFX_GMA_INTERNAL_IS_EDP