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>
2016-11-29 16:46:56 +02:00 · 2016-11-29 16:46:56 +02:00 · 3d15e10aef
parent 6f66f414a0
commit 3d15e10aef
46 changed files with 22 additions and 40 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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

--- 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

--- 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

--- 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
--- 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
--- 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

--- 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
--- 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

--- 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
--- 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
--- 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

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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