Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b45c9f36 authored by Jan Kiszka's avatar Jan Kiszka Committed by Thomas Gleixner
Browse files

x86: Consolidate PCI_MMCONFIG configs 



Since e279b6c1 ("x86: start unification of arch/x86/Kconfig.*"), there
exist two PCI_MMCONFIG entries, one from the original i386 and another from
x86_64. Consolidate both entries into a single one.

Signed-off-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: jailhouse-dev@googlegroups.com
Cc: linux-pci@vger.kernel.org
Cc: virtualization@lists.linux-foundation.org
Cc: Andy Shevchenko <andy.shevchenko@gmail.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Link: https://lkml.kernel.org/r/2a0ccd51ea6f7996e07162918228e23bdc1fbb03.1520408357.git.jan.kiszka@siemens.com
parent 55027a77

arch/x86/Kconfig

+4 −7
Original line number Diff line number Diff line
@@ -2640,8 +2640,10 @@ config PCI_DIRECT 
	depends on PCI && (X86_64 || (PCI_GODIRECT || PCI_GOANY || PCI_GOOLPC || PCI_GOMMCONFIG))



config PCI_MMCONFIG

	def_bool y

	depends on X86_32 && PCI && (ACPI || SFI) && (PCI_GOMMCONFIG || PCI_GOANY)

	bool "Support mmconfig PCI config space access" if X86_64

	default y

	depends on PCI && (ACPI || SFI)

	depends on X86_64 || (PCI_GOANY || PCI_GOMMCONFIG)



config PCI_OLPC

	def_bool y
@@ -2656,11 +2658,6 @@ config PCI_DOMAINS 
	def_bool y

	depends on PCI



config PCI_MMCONFIG

	bool "Support mmconfig PCI config space access"

	default y

	depends on X86_64 && PCI && (ACPI || SFI)



config PCI_CNB20LE_QUIRK

	bool "Read CNB20LE Host Bridge Windows" if EXPERT

	depends on PCI