MMCONF_SUPPORT: Flip default to enabled

Also remove separate MMCONF_SUPPORT_DEFAULT flag.

Change-Id: Idf1accdb93843a8fe2ee9c09fb984968652476e0
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/17694
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>

46 files changed, 22 insertions, 40 deletions

diff --git a/src/cpu/amd/agesa/family10/Kconfig b/src/cpu/amd/agesa/family10/Kconfig
index 6bb8d43260..b1076e11ce 100644
--- a/src/cpu/amd/agesa/family10/Kconfig
+++ b/src/cpu/amd/agesa/family10/Kconfig
@@ -16,7 +16,6 @@
 config CPU_AMD_AGESA_FAMILY10
 	bool
 	select CPU_AMD_MODEL_10XXX
-	select MMCONF_SUPPORT_DEFAULT
 	select X86_AMD_FIXED_MTRRS
 
 if CPU_AMD_AGESA_FAMILY10
diff --git a/src/cpu/amd/agesa/family12/Kconfig b/src/cpu/amd/agesa/family12/Kconfig
index 8e4c7bad2f..fa9cd5fca5 100644
--- a/src/cpu/amd/agesa/family12/Kconfig
+++ b/src/cpu/amd/agesa/family12/Kconfig
@@ -15,7 +15,6 @@
 
 config CPU_AMD_AGESA_FAMILY12
 	bool
-	select MMCONF_SUPPORT_DEFAULT
 	select X86_AMD_FIXED_MTRRS
 
 if CPU_AMD_AGESA_FAMILY12
diff --git a/src/cpu/amd/agesa/family14/Kconfig b/src/cpu/amd/agesa/family14/Kconfig
index 7be63f5fcb..c539d27e14 100644
--- a/src/cpu/amd/agesa/family14/Kconfig
+++ b/src/cpu/amd/agesa/family14/Kconfig
@@ -15,7 +15,6 @@
 
 config CPU_AMD_AGESA_FAMILY14
 	bool
-	select MMCONF_SUPPORT_DEFAULT
 	select X86_AMD_FIXED_MTRRS
 
 if CPU_AMD_AGESA_FAMILY14
diff --git a/src/cpu/amd/agesa/family15/Kconfig b/src/cpu/amd/agesa/family15/Kconfig
index 22e4d8c0f5..3f13b3ef40 100644
--- a/src/cpu/amd/agesa/family15/Kconfig
+++ b/src/cpu/amd/agesa/family15/Kconfig
@@ -15,7 +15,6 @@
 
 config CPU_AMD_AGESA_FAMILY15
 	bool
-	select MMCONF_SUPPORT_DEFAULT
 	select X86_AMD_FIXED_MTRRS
 
 if CPU_AMD_AGESA_FAMILY15
diff --git a/src/cpu/amd/agesa/family15rl/Kconfig b/src/cpu/amd/agesa/family15rl/Kconfig
index b916e2c145..85087ef128 100644
--- a/src/cpu/amd/agesa/family15rl/Kconfig
+++ b/src/cpu/amd/agesa/family15rl/Kconfig
@@ -16,7 +16,6 @@
 
 config CPU_AMD_AGESA_FAMILY15_RL
 	bool
-	select MMCONF_SUPPORT_DEFAULT
 	select X86_AMD_FIXED_MTRRS
 
 if CPU_AMD_AGESA_FAMILY15_RL
diff --git a/src/cpu/amd/agesa/family15tn/Kconfig b/src/cpu/amd/agesa/family15tn/Kconfig
index 1f41560a4d..1cc77b8adf 100644
--- a/src/cpu/amd/agesa/family15tn/Kconfig
+++ b/src/cpu/amd/agesa/family15tn/Kconfig
@@ -15,7 +15,6 @@
 
 config CPU_AMD_AGESA_FAMILY15_TN
 	bool
-	select MMCONF_SUPPORT_DEFAULT
 	select X86_AMD_FIXED_MTRRS
 
 if CPU_AMD_AGESA_FAMILY15_TN
diff --git a/src/cpu/amd/agesa/family16kb/Kconfig b/src/cpu/amd/agesa/family16kb/Kconfig
index 3f65055275..0cdf55ae0c 100644
--- a/src/cpu/amd/agesa/family16kb/Kconfig
+++ b/src/cpu/amd/agesa/family16kb/Kconfig
@@ -15,7 +15,6 @@
 
 config CPU_AMD_AGESA_FAMILY16_KB
 	bool
-	select MMCONF_SUPPORT_DEFAULT
 	select X86_AMD_FIXED_MTRRS
 
 if CPU_AMD_AGESA_FAMILY16_KB
diff --git a/src/cpu/amd/family_10h-family_15h/Kconfig b/src/cpu/amd/family_10h-family_15h/Kconfig
index fda7fc8085..95338dfbd7 100644
--- a/src/cpu/amd/family_10h-family_15h/Kconfig
+++ b/src/cpu/amd/family_10h-family_15h/Kconfig
@@ -6,7 +6,6 @@ config CPU_AMD_MODEL_10XXX
 	select ARCH_RAMSTAGE_X86_32
 	select SSE
 	select SSE2
-	select MMCONF_SUPPORT_DEFAULT
 	select TSC_SYNC_LFENCE
 	select UDELAY_LAPIC
 	select HAVE_MONOTONIC_TIMER
diff --git a/src/cpu/amd/geode_gx2/Kconfig b/src/cpu/amd/geode_gx2/Kconfig
index 51dece545f..c7745ecd56 100644
--- a/src/cpu/amd/geode_gx2/Kconfig
+++ b/src/cpu/amd/geode_gx2/Kconfig
@@ -24,6 +24,7 @@ if CPU_AMD_GEODE_GX2
 
 config CPU_SPECIFIC_OPTIONS
 	def_bool y
+	select NO_MMCONF_SUPPORT
 
 config DCACHE_RAM_BASE
 	hex
diff --git a/src/cpu/amd/geode_lx/Kconfig b/src/cpu/amd/geode_lx/Kconfig
index 3a01828e71..82a5d46da3 100644
--- a/src/cpu/amd/geode_lx/Kconfig
+++ b/src/cpu/amd/geode_lx/Kconfig
@@ -9,6 +9,7 @@ if CPU_AMD_GEODE_LX
 
 config CPU_SPECIFIC_OPTIONS
 	def_bool y
+	select NO_MMCONF_SUPPORT
 	select TSC_MONOTONIC_TIMER
 
 config DCACHE_RAM_BASE
diff --git a/src/cpu/amd/pi/00630F01/Kconfig b/src/cpu/amd/pi/00630F01/Kconfig
index 5c12ab6b78..910df58e5b 100644
--- a/src/cpu/amd/pi/00630F01/Kconfig
+++ b/src/cpu/amd/pi/00630F01/Kconfig
@@ -15,7 +15,6 @@
 
 config CPU_AMD_PI_00630F01
 	bool
-	select MMCONF_SUPPORT_DEFAULT
 	select X86_AMD_FIXED_MTRRS
 
 if CPU_AMD_PI_00630F01
diff --git a/src/cpu/amd/pi/00660F01/Kconfig b/src/cpu/amd/pi/00660F01/Kconfig
index b38ea6ce76..aab0639b0c 100644
--- a/src/cpu/amd/pi/00660F01/Kconfig
+++ b/src/cpu/amd/pi/00660F01/Kconfig
@@ -15,7 +15,6 @@
 
 config CPU_AMD_PI_00660F01
 	bool
-	select MMCONF_SUPPORT_DEFAULT
 	select X86_AMD_FIXED_MTRRS
 
 if CPU_AMD_PI_00660F01
diff --git a/src/cpu/amd/pi/00670F00/Kconfig b/src/cpu/amd/pi/00670F00/Kconfig
index e47dfa3f53..b4ba450aaf 100644
--- a/src/cpu/amd/pi/00670F00/Kconfig
+++ b/src/cpu/amd/pi/00670F00/Kconfig
@@ -15,7 +15,6 @@
 
 config CPU_AMD_PI_00670F00
 	bool
-	select MMCONF_SUPPORT_DEFAULT
 	select X86_AMD_FIXED_MTRRS
 
 if CPU_AMD_PI_00670F00
diff --git a/src/cpu/amd/pi/00730F01/Kconfig b/src/cpu/amd/pi/00730F01/Kconfig
index 83af181ea0..ecbdb53b48 100644
--- a/src/cpu/amd/pi/00730F01/Kconfig
+++ b/src/cpu/amd/pi/00730F01/Kconfig
@@ -15,7 +15,6 @@
 
 config CPU_AMD_PI_00730F01
 	bool
-	select MMCONF_SUPPORT_DEFAULT
 	select X86_AMD_FIXED_MTRRS
 
 if CPU_AMD_PI_00730F01
diff --git a/src/device/Kconfig b/src/device/Kconfig
index 622f3d5837..d2385471a7 100644
--- a/src/device/Kconfig
+++ b/src/device/Kconfig
@@ -221,15 +221,11 @@ if PCI
 
 config NO_MMCONF_SUPPORT
 	bool
-	default !MMCONF_SUPPORT_DEFAULT
+	default n
 
 config MMCONF_SUPPORT
 	bool
-	default MMCONF_SUPPORT_DEFAULT
-
-config MMCONF_SUPPORT_DEFAULT
-	bool
-	default n
+	default !NO_MMCONF_SUPPORT
 
 config HYPERTRANSPORT_PLUGIN_SUPPORT
 	bool
diff --git a/src/mainboard/emulation/qemu-i440fx/Kconfig b/src/mainboard/emulation/qemu-i440fx/Kconfig
index 1dba29d05d..9a65f7075e 100644
--- a/src/mainboard/emulation/qemu-i440fx/Kconfig
+++ b/src/mainboard/emulation/qemu-i440fx/Kconfig
@@ -3,6 +3,7 @@ if BOARD_EMULATION_QEMU_X86_I440FX
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select CPU_QEMU_X86
+	select NO_MMCONF_SUPPORT
 	select SOUTHBRIDGE_INTEL_I82371EB
 	select HAVE_OPTION_TABLE
 	select HAVE_CMOS_DEFAULT
diff --git a/src/mainboard/emulation/qemu-q35/Kconfig b/src/mainboard/emulation/qemu-q35/Kconfig
index 442356e4b3..3000533f41 100644
--- a/src/mainboard/emulation/qemu-q35/Kconfig
+++ b/src/mainboard/emulation/qemu-q35/Kconfig
@@ -5,7 +5,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select CPU_QEMU_X86
 	select SOUTHBRIDGE_INTEL_I82801IX
 	select IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS
-	select MMCONF_SUPPORT_DEFAULT
 #	select HAVE_OPTION_TABLE
 #	select HAVE_PIRQ_TABLE
 	select HAVE_ACPI_TABLES
diff --git a/src/northbridge/amd/amdk8/Kconfig b/src/northbridge/amd/amdk8/Kconfig
index f1ee3c3d4a..83f70c90c2 100644
--- a/src/northbridge/amd/amdk8/Kconfig
+++ b/src/northbridge/amd/amdk8/Kconfig
@@ -22,6 +22,14 @@ config NORTHBRIDGE_AMD_AMDK8
 	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 c1faac06db..702ba1c913 100644
--- a/src/northbridge/intel/e7505/Kconfig
+++ b/src/northbridge/intel/e7505/Kconfig
@@ -20,6 +20,7 @@ if NORTHBRIDGE_INTEL_E7505
 
 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 506a913729..bc7352641c 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 96b2df52ec..89326b4b5c 100644
--- a/src/northbridge/intel/fsp_sandybridge/Kconfig
+++ b/src/northbridge/intel/fsp_sandybridge/Kconfig
@@ -18,13 +18,11 @@ config NORTHBRIDGE_INTEL_FSP_SANDYBRIDGE
 	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 80447d506a..ca1f9c6d21 100644
--- a/src/northbridge/intel/gm45/Kconfig
+++ b/src/northbridge/intel/gm45/Kconfig
@@ -21,7 +21,6 @@ if NORTHBRIDGE_INTEL_GM45
 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 db51dd2164..4fc117d167 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 2260664129..7d4f4e5254 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 3f574a48d6..36d47542ba 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 9fde6cb8e4..67a21fcbc7 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 428505cc60..7d8c46b47c 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 344dfedca8..d0bee8f9eb 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 25a1fd5979..a9439dcd40 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 d22451a487..8f59be5b80 100644
--- a/src/northbridge/intel/i945/Kconfig
+++ b/src/northbridge/intel/i945/Kconfig
@@ -20,7 +20,6 @@ if NORTHBRIDGE_INTEL_I945
 
 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 eee9405bb3..4dada50aaf 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 188db6d75c..5b34fb2bfe 100644
--- a/src/northbridge/intel/pineview/Kconfig
+++ b/src/northbridge/intel/pineview/Kconfig
@@ -21,7 +21,6 @@ if NORTHBRIDGE_INTEL_PINEVIEW
 
 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 7ca897e2ec..c78b397ecc 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_SANDYBRIDGE
 
 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 43c7b2a04f..57e93f9580 100644
--- a/src/northbridge/intel/x4x/Kconfig
+++ b/src/northbridge/intel/x4x/Kconfig
@@ -22,7 +22,6 @@ if NORTHBRIDGE_INTEL_X4X
 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 18897054d8..98af4e8655 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 03014eb964..ec2c75ba1d 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 9eb84fb14e..9bcb7cd855 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 182345e88e..73d40adfba 100644
--- a/src/northbridge/via/vx900/Kconfig
+++ b/src/northbridge/via/vx900/Kconfig
@@ -21,7 +21,6 @@ config NORTHBRIDGE_VIA_VX900
 	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
diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig
index 092102cfbc..6769af0d0a 100644
--- a/src/soc/intel/apollolake/Kconfig
+++ b/src/soc/intel/apollolake/Kconfig
@@ -32,7 +32,6 @@ config CPU_SPECIFIC_OPTIONS
 	select GENERIC_GPIO_LIB
 	select HAVE_INTEL_FIRMWARE
 	select HAVE_SMI_HANDLER
-	select MMCONF_SUPPORT_DEFAULT
 	select MRC_SETTINGS_PROTECT
 	select NO_FIXED_XIP_ROM_SIZE
 	select NO_XIP_EARLY_STAGES
diff --git a/src/soc/intel/baytrail/Kconfig b/src/soc/intel/baytrail/Kconfig
index 5fd88a5e8a..2d07c99ad9 100644
--- a/src/soc/intel/baytrail/Kconfig
+++ b/src/soc/intel/baytrail/Kconfig
@@ -18,7 +18,6 @@ config CPU_SPECIFIC_OPTIONS
 	select SUPPORT_CPU_UCODE_IN_CBFS
 	select HAVE_SMI_HANDLER
 	select HAVE_HARD_RESET
-	select MMCONF_SUPPORT_DEFAULT
 	select NO_FIXED_XIP_ROM_SIZE
 	select RELOCATABLE_MODULES
 	select RELOCATABLE_RAMSTAGE
diff --git a/src/soc/intel/braswell/Kconfig b/src/soc/intel/braswell/Kconfig
index b3ca1b8e86..ac4a2ae213 100644
--- a/src/soc/intel/braswell/Kconfig
+++ b/src/soc/intel/braswell/Kconfig
@@ -21,7 +21,6 @@ config CPU_SPECIFIC_OPTIONS
 	select HAVE_MONOTONIC_TIMER
 	select HAVE_SMI_HANDLER
 	select HAVE_HARD_RESET
-	select MMCONF_SUPPORT_DEFAULT
 	select NO_FIXED_XIP_ROM_SIZE
 	select RELOCATABLE_MODULES
 	select PARALLEL_MP
diff --git a/src/soc/intel/broadwell/Kconfig b/src/soc/intel/broadwell/Kconfig
index 2c62d29870..75cd8317ac 100644
--- a/src/soc/intel/broadwell/Kconfig
+++ b/src/soc/intel/broadwell/Kconfig
@@ -23,7 +23,6 @@ config CPU_SPECIFIC_OPTIONS
 	select HAVE_HARD_RESET
 	select HAVE_USBDEBUG
 	select IOAPIC
-	select MMCONF_SUPPORT_DEFAULT
 	select RELOCATABLE_MODULES
 	select RELOCATABLE_RAMSTAGE
 	select REG_SCRIPT
diff --git a/src/soc/intel/fsp_baytrail/Kconfig b/src/soc/intel/fsp_baytrail/Kconfig
index 6260630edb..689e625535 100644
--- a/src/soc/intel/fsp_baytrail/Kconfig
+++ b/src/soc/intel/fsp_baytrail/Kconfig
@@ -30,7 +30,6 @@ config CPU_SPECIFIC_OPTIONS
 	select ARCH_RAMSTAGE_X86_32
 	select HAVE_SMI_HANDLER
 	select HAVE_HARD_RESET
-	select MMCONF_SUPPORT_DEFAULT
 	select RELOCATABLE_MODULES
 	select PARALLEL_MP
 	select REG_SCRIPT
diff --git a/src/soc/intel/fsp_broadwell_de/Kconfig b/src/soc/intel/fsp_broadwell_de/Kconfig
index 72979dee07..8442963977 100644
--- a/src/soc/intel/fsp_broadwell_de/Kconfig
+++ b/src/soc/intel/fsp_broadwell_de/Kconfig
@@ -13,7 +13,6 @@ config CPU_SPECIFIC_OPTIONS
 	select ARCH_ROMSTAGE_X86_32
 	select ARCH_RAMSTAGE_X86_32
 	select HAVE_HARD_RESET
-	select MMCONF_SUPPORT_DEFAULT
 	select RELOCATABLE_MODULES
 	select PARALLEL_MP
 	select SMP
diff --git a/src/soc/intel/sch/Kconfig b/src/soc/intel/sch/Kconfig
index ed3e0032da..2456df79ca 100644
--- a/src/soc/intel/sch/Kconfig
+++ b/src/soc/intel/sch/Kconfig
@@ -15,7 +15,6 @@
 
 config SOC_INTEL_SCH
 	bool
-	select MMCONF_SUPPORT_DEFAULT
 	select LATE_CBMEM_INIT
 	select INTEL_GMA_ACPI
 	select SOUTHBRIDGE_INTEL_COMMON
diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig
index 1778daecd6..24c2e303b3 100644
--- a/src/soc/intel/skylake/Kconfig
+++ b/src/soc/intel/skylake/Kconfig
@@ -28,7 +28,6 @@ config CPU_SPECIFIC_OPTIONS
 	select HAVE_MONOTONIC_TIMER
 	select HAVE_SMI_HANDLER
 	select IOAPIC
-	select MMCONF_SUPPORT_DEFAULT
 	select NO_FIXED_XIP_ROM_SIZE
 	select MRC_SETTINGS_PROTECT
 	select PARALLEL_MP