diff --git a/src/northbridge/amd/amdk8/Kconfig b/src/northbridge/amd/amdk8/Kconfig
index f1ee3c3..83f70c9 100644
--- a/src/northbridge/amd/amdk8/Kconfig
+++ b/src/northbridge/amd/amdk8/Kconfig
@@ -22,6 +22,14 @@
 	select LATE_CBMEM_INIT
 
 if NORTHBRIDGE_AMD_AMDK8
+
+config NO_MMCONF_SUPPORT
+	bool
+	default y
+	help
+	   If you want to remove this, you need to make sure any access to CPU
+	   nodes 0:18.0, 0:19.0, ...  continue to use PCI IO config access.
+
 config AGP_APERTURE_SIZE
 	hex
 	default 0x4000000
diff --git a/src/northbridge/intel/e7505/Kconfig b/src/northbridge/intel/e7505/Kconfig
index c1faac0..702ba1c 100644
--- a/src/northbridge/intel/e7505/Kconfig
+++ b/src/northbridge/intel/e7505/Kconfig
@@ -20,6 +20,7 @@
 
 config NORTHBRIDGE_SPECIFIC_OPTIONS # dummy
 	def_bool y
+	select NO_MMCONF_SUPPORT
 	select HAVE_DEBUG_RAM_SETUP
 	select LATE_CBMEM_INIT
 
diff --git a/src/northbridge/intel/fsp_rangeley/Kconfig b/src/northbridge/intel/fsp_rangeley/Kconfig
index 506a913..bc73526 100644
--- a/src/northbridge/intel/fsp_rangeley/Kconfig
+++ b/src/northbridge/intel/fsp_rangeley/Kconfig
@@ -17,7 +17,6 @@
 config NORTHBRIDGE_INTEL_FSP_RANGELEY
 	bool
 	select CPU_INTEL_FSP_MODEL_406DX
-	select MMCONF_SUPPORT_DEFAULT
 
 if NORTHBRIDGE_INTEL_FSP_RANGELEY
 
diff --git a/src/northbridge/intel/fsp_sandybridge/Kconfig b/src/northbridge/intel/fsp_sandybridge/Kconfig
index 96b2df5..89326b4 100644
--- a/src/northbridge/intel/fsp_sandybridge/Kconfig
+++ b/src/northbridge/intel/fsp_sandybridge/Kconfig
@@ -18,13 +18,11 @@
 	bool
 	select CPU_INTEL_FSP_MODEL_206AX
 	select INTEL_GMA_ACPI
-	select MMCONF_SUPPORT_DEFAULT
 
 config NORTHBRIDGE_INTEL_FSP_IVYBRIDGE
 	bool
 	select CPU_INTEL_FSP_MODEL_306AX
 	select INTEL_GMA_ACPI
-	select MMCONF_SUPPORT_DEFAULT
 
 if NORTHBRIDGE_INTEL_FSP_IVYBRIDGE || NORTHBRIDGE_INTEL_FSP_SANDYBRIDGE
 
diff --git a/src/northbridge/intel/gm45/Kconfig b/src/northbridge/intel/gm45/Kconfig
index 80447d5..ca1f9c6 100644
--- a/src/northbridge/intel/gm45/Kconfig
+++ b/src/northbridge/intel/gm45/Kconfig
@@ -21,7 +21,6 @@
 config NORTHBRIDGE_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select HAVE_DEBUG_RAM_SETUP
-	select MMCONF_SUPPORT_DEFAULT
 	select VGA
 	select INTEL_EDID
 	select INTEL_GMA_ACPI
diff --git a/src/northbridge/intel/haswell/Kconfig b/src/northbridge/intel/haswell/Kconfig
index db51dd2..4fc117d 100644
--- a/src/northbridge/intel/haswell/Kconfig
+++ b/src/northbridge/intel/haswell/Kconfig
@@ -16,7 +16,6 @@
 config NORTHBRIDGE_INTEL_HASWELL
 	bool
 	select CPU_INTEL_HASWELL
-	select MMCONF_SUPPORT_DEFAULT
 	select NORTHBRIDGE_INTEL_COMMON_MRC_CACHE
 	select INTEL_DDI
 	select INTEL_DP
diff --git a/src/northbridge/intel/i3100/Kconfig b/src/northbridge/intel/i3100/Kconfig
index 2260664..7d4f4e5 100644
--- a/src/northbridge/intel/i3100/Kconfig
+++ b/src/northbridge/intel/i3100/Kconfig
@@ -1,5 +1,6 @@
 config NORTHBRIDGE_INTEL_I3100
 	bool
+	select NO_MMCONF_SUPPORT
 	select LATE_CBMEM_INIT
 	select UDELAY_IO
 
diff --git a/src/northbridge/intel/i440bx/Kconfig b/src/northbridge/intel/i440bx/Kconfig
index 3f574a4..36d4754 100644
--- a/src/northbridge/intel/i440bx/Kconfig
+++ b/src/northbridge/intel/i440bx/Kconfig
@@ -15,6 +15,7 @@
 
 config NORTHBRIDGE_INTEL_I440BX
 	bool
+	select NO_MMCONF_SUPPORT
 	select HAVE_DEBUG_RAM_SETUP
 	select LATE_CBMEM_INIT
 	select UDELAY_IO
diff --git a/src/northbridge/intel/i5000/Kconfig b/src/northbridge/intel/i5000/Kconfig
index 9fde6cb..67a21fc 100644
--- a/src/northbridge/intel/i5000/Kconfig
+++ b/src/northbridge/intel/i5000/Kconfig
@@ -15,7 +15,6 @@
 
 config NORTHBRIDGE_INTEL_I5000
 	bool
-	select MMCONF_SUPPORT_DEFAULT
 	select HAVE_DEBUG_RAM_SETUP
 	select LATE_CBMEM_INIT
 
diff --git a/src/northbridge/intel/i82810/Kconfig b/src/northbridge/intel/i82810/Kconfig
index 428505c..7d8c46b 100644
--- a/src/northbridge/intel/i82810/Kconfig
+++ b/src/northbridge/intel/i82810/Kconfig
@@ -15,6 +15,7 @@
 
 config NORTHBRIDGE_INTEL_I82810
 	bool
+	select NO_MMCONF_SUPPORT
 	select HAVE_DEBUG_RAM_SETUP
 	select LATE_CBMEM_INIT
 	select UDELAY_IO
diff --git a/src/northbridge/intel/i82830/Kconfig b/src/northbridge/intel/i82830/Kconfig
index 344dfed..d0bee8f 100644
--- a/src/northbridge/intel/i82830/Kconfig
+++ b/src/northbridge/intel/i82830/Kconfig
@@ -1,5 +1,6 @@
 config NORTHBRIDGE_INTEL_I82830
 	bool
+	select NO_MMCONF_SUPPORT
 	select HAVE_DEBUG_RAM_SETUP
 	select LATE_CBMEM_INIT
 	select UDELAY_IO
diff --git a/src/northbridge/intel/i855/Kconfig b/src/northbridge/intel/i855/Kconfig
index 25a1fd5..a9439dc 100644
--- a/src/northbridge/intel/i855/Kconfig
+++ b/src/northbridge/intel/i855/Kconfig
@@ -1,5 +1,6 @@
 config NORTHBRIDGE_INTEL_I855
 	bool
+	select NO_MMCONF_SUPPORT
 	select HAVE_DEBUG_RAM_SETUP
 	select LATE_CBMEM_INIT
 
diff --git a/src/northbridge/intel/i945/Kconfig b/src/northbridge/intel/i945/Kconfig
index d22451a..8f59be5 100644
--- a/src/northbridge/intel/i945/Kconfig
+++ b/src/northbridge/intel/i945/Kconfig
@@ -20,7 +20,6 @@
 
 config NORTHBRIDGE_SPECIFIC_OPTIONS # dummy
 	def_bool y
-	select MMCONF_SUPPORT_DEFAULT
 	select HAVE_DEBUG_RAM_SETUP
 	select LAPIC_MONOTONIC_TIMER
 	select VGA
diff --git a/src/northbridge/intel/nehalem/Kconfig b/src/northbridge/intel/nehalem/Kconfig
index eee9405..4dada50 100644
--- a/src/northbridge/intel/nehalem/Kconfig
+++ b/src/northbridge/intel/nehalem/Kconfig
@@ -16,7 +16,6 @@
 config NORTHBRIDGE_INTEL_NEHALEM
 	bool
 	select CPU_INTEL_MODEL_2065X
-	select MMCONF_SUPPORT_DEFAULT
 	select VGA
 	select INTEL_EDID
 	select TSC_MONOTONIC_TIMER
diff --git a/src/northbridge/intel/pineview/Kconfig b/src/northbridge/intel/pineview/Kconfig
index 188db6d..5b34fb2 100644
--- a/src/northbridge/intel/pineview/Kconfig
+++ b/src/northbridge/intel/pineview/Kconfig
@@ -21,7 +21,6 @@
 
 config NORTHBRIDGE_SPECIFIC_OPTIONS # dummy
 	def_bool y
-	select MMCONF_SUPPORT_DEFAULT
 	select HAVE_DEBUG_RAM_SETUP
 	select LAPIC_MONOTONIC_TIMER
 	select LATE_CBMEM_INIT
diff --git a/src/northbridge/intel/sandybridge/Kconfig b/src/northbridge/intel/sandybridge/Kconfig
index 7ca897e..c78b397 100644
--- a/src/northbridge/intel/sandybridge/Kconfig
+++ b/src/northbridge/intel/sandybridge/Kconfig
@@ -16,7 +16,6 @@
 
 config NORTHBRIDGE_INTEL_SANDYBRIDGE
 	bool
-	select MMCONF_SUPPORT_DEFAULT
 	select NORTHBRIDGE_INTEL_COMMON_MRC_CACHE
 	select CPU_INTEL_MODEL_206AX
 	select HAVE_DEBUG_RAM_SETUP
@@ -25,7 +24,6 @@
 
 config NORTHBRIDGE_INTEL_IVYBRIDGE
 	bool
-	select MMCONF_SUPPORT_DEFAULT
 	select NORTHBRIDGE_INTEL_COMMON_MRC_CACHE
 	select CPU_INTEL_MODEL_306AX
 	select HAVE_DEBUG_RAM_SETUP
diff --git a/src/northbridge/intel/x4x/Kconfig b/src/northbridge/intel/x4x/Kconfig
index 43c7b2a..57e93f9 100644
--- a/src/northbridge/intel/x4x/Kconfig
+++ b/src/northbridge/intel/x4x/Kconfig
@@ -22,7 +22,6 @@
 config NORTHBRIDGE_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select HAVE_DEBUG_RAM_SETUP
-	select MMCONF_SUPPORT_DEFAULT
 	select VGA
 	select INTEL_GMA_ACPI
 	select EARLY_CBMEM_INIT
diff --git a/src/northbridge/via/cn700/Kconfig b/src/northbridge/via/cn700/Kconfig
index 1889705..98af4e8 100644
--- a/src/northbridge/via/cn700/Kconfig
+++ b/src/northbridge/via/cn700/Kconfig
@@ -1,5 +1,6 @@
 config NORTHBRIDGE_VIA_CN700
 	bool
+	select NO_MMCONF_SUPPORT
 	select HAVE_DEBUG_RAM_SETUP
 	select LATE_CBMEM_INIT
 
diff --git a/src/northbridge/via/cx700/Kconfig b/src/northbridge/via/cx700/Kconfig
index 03014eb..ec2c75b 100644
--- a/src/northbridge/via/cx700/Kconfig
+++ b/src/northbridge/via/cx700/Kconfig
@@ -1,5 +1,6 @@
 config NORTHBRIDGE_VIA_CX700
 	bool
+	select NO_MMCONF_SUPPORT
 	select HAVE_DEBUG_RAM_SETUP
 	select HAVE_DEBUG_SMBUS
 	select HAVE_HARD_RESET
diff --git a/src/northbridge/via/vx800/Kconfig b/src/northbridge/via/vx800/Kconfig
index 9eb84fb..9bcb7cd 100644
--- a/src/northbridge/via/vx800/Kconfig
+++ b/src/northbridge/via/vx800/Kconfig
@@ -1,5 +1,6 @@
 config NORTHBRIDGE_VIA_VX800
 	bool
+	select NO_MMCONF_SUPPORT
 	select HAVE_DEBUG_RAM_SETUP
 	select HAVE_DEBUG_SMBUS
 	select LATE_CBMEM_INIT
diff --git a/src/northbridge/via/vx900/Kconfig b/src/northbridge/via/vx900/Kconfig
index 182345e..73d40ad 100644
--- a/src/northbridge/via/vx900/Kconfig
+++ b/src/northbridge/via/vx900/Kconfig
@@ -21,7 +21,6 @@
 	select HAVE_DEBUG_RAM_SETUP
 	select HAVE_DEBUG_SMBUS
 	select HAVE_HARD_RESET
-	select MMCONF_SUPPORT_DEFAULT
 	select LATE_CBMEM_INIT
 
 if NORTHBRIDGE_VIA_VX900