powerpc/powernv: Make PCI non-optional
authorMichael Ellerman <mpe@ellerman.id.au>
Fri, 17 Feb 2017 06:34:13 +0000 (17:34 +1100)
committerMichael Ellerman <mpe@ellerman.id.au>
Mon, 20 Feb 2017 03:56:26 +0000 (14:56 +1100)
Bare metal systems without PCI don't exist, so there's no real point in
making PCI optional, it just breaks the build from time to time. In fact
the build is broken now if you turn off PCI_MSI but enable KVM.

Using select for PCI is OK because we (powerpc) define config PCI, and it
has no dependencies. Selecting PCI_MSI is slightly fishy, because it's
in drivers/pci and it is user-visible, but its only dependency is PCI,
so selecting it can't actually lead to breakage.

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Acked-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/platforms/powernv/Kconfig

index 604190cab5227c6fd8957baa00aa3ae6ca87a790..3a07e4dcf97c43d7a1bf619294ea94f37ff032dc 100644 (file)
@@ -5,7 +5,8 @@ config PPC_POWERNV
        select PPC_XICS
        select PPC_ICP_NATIVE
        select PPC_P7_NAP
-       select PPC_PCI_CHOICE if EMBEDDED
+       select PCI
+       select PCI_MSI
        select EPAPR_BOOT
        select PPC_INDIRECT_PIO
        select PPC_UDBG_16550