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

Commit ff61e5cc authored by Michael Ellerman's avatar Michael Ellerman Committed by Paul Mackerras
Browse files

powerpc/cell: Select PCI for IBM_CELL_BLADE AND CELLEB 



Currently PPC_CELL_NATIVE selects PPC_OF_PLATFORM_PCI, but does not
select PCI. This can lead to a config with the former and the latter
disabled, which does not build.

To fix this PPC_CELL_NATIVE should select PCI. However, that would
force PCI on for QPACE, which also selects PPC_CELL_NATIVE. So
instead move the select of PPC_OF_PLATFORM_PCI and PCI under both
IBM_CELL_BLADE and CELLEB.

Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 2e8aead1

arch/powerpc/platforms/cell/Kconfig

+4 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ config PPC_CELL_COMMON 
config PPC_CELL_NATIVE

	bool

	select PPC_CELL_COMMON

	select PPC_OF_PLATFORM_PCI

	select MPIC

	select IBM_NEW_EMAC_EMAC4

	select IBM_NEW_EMAC_RGMII
@@ -25,6 +24,8 @@ config PPC_IBM_CELL_BLADE 
	bool "IBM Cell Blade"

	depends on PPC64 && PPC_BOOK3S

	select PPC_CELL_NATIVE

	select PPC_OF_PLATFORM_PCI

	select PCI

	select MMIO_NVRAM

	select PPC_UDBG_16550

	select UDBG_RTAS_CONSOLE
@@ -33,6 +34,8 @@ config PPC_CELLEB 
	bool "Toshiba's Cell Reference Set 'Celleb' Architecture"

	depends on PPC64 && PPC_BOOK3S

	select PPC_CELL_NATIVE

	select PPC_OF_PLATFORM_PCI

	select PCI

	select HAS_TXX9_SERIAL

	select PPC_UDBG_BEAT

	select USB_OHCI_BIG_ENDIAN_MMIO