diff --git a/src/cpu/x86/Kconfig b/src/cpu/x86/Kconfig
index bd3be78b0c..ec7482c4e1 100644
--- a/src/cpu/x86/Kconfig
+++ b/src/cpu/x86/Kconfig
@@ -181,9 +181,9 @@ endif
 
 config SMM_LAPIC_REMAP_MITIGATION
 	bool
-	default y if NORTHBRIDGE_INTEL_I945
-	default y if NORTHBRIDGE_INTEL_GM45
-	default y if NORTHBRIDGE_INTEL_IRONLAKE
+	default y if NORTHBRIDGE_INTEL_I945 || NORTHBRIDGE_INTEL_GM45 \
+		|| NORTHBRIDGE_INTEL_X4X || NORTHBRIDGE_INTEL_PINEVIEW \
+		|| NORTHBRIDGE_INTEL_E7505 || NORTHBRIDGE_INTEL_IRONLAKE
 	default n
 
 config X86_AMD_FIXED_MTRRS