tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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: Michael Ellerman <michael@ellerman.id.au>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>

authored by Michael Ellerman and committed by Paul Mackerras ff61e5cc 2e8aead1

+4 -1
unified split
+4 -1
arch/powerpc/platforms/cell/Kconfig
··· 13 config PPC_CELL_NATIVE 14 bool 15 select PPC_CELL_COMMON 16 - select PPC_OF_PLATFORM_PCI 17 select MPIC 18 select IBM_NEW_EMAC_EMAC4 19 select IBM_NEW_EMAC_RGMII ··· 24 bool "IBM Cell Blade" 25 depends on PPC64 && PPC_BOOK3S 26 select PPC_CELL_NATIVE 27 select MMIO_NVRAM 28 select PPC_UDBG_16550 29 select UDBG_RTAS_CONSOLE ··· 34 bool "Toshiba's Cell Reference Set 'Celleb' Architecture" 35 depends on PPC64 && PPC_BOOK3S 36 select PPC_CELL_NATIVE 37 select HAS_TXX9_SERIAL 38 select PPC_UDBG_BEAT 39 select USB_OHCI_BIG_ENDIAN_MMIO
··· 13 config PPC_CELL_NATIVE 14 bool 15 select PPC_CELL_COMMON 16 select MPIC 17 select IBM_NEW_EMAC_EMAC4 18 select IBM_NEW_EMAC_RGMII ··· 25 bool "IBM Cell Blade" 26 depends on PPC64 && PPC_BOOK3S 27 select PPC_CELL_NATIVE 28 + select PPC_OF_PLATFORM_PCI 29 + select PCI 30 select MMIO_NVRAM 31 select PPC_UDBG_16550 32 select UDBG_RTAS_CONSOLE ··· 33 bool "Toshiba's Cell Reference Set 'Celleb' Architecture" 34 depends on PPC64 && PPC_BOOK3S 35 select PPC_CELL_NATIVE 36 + select PPC_OF_PLATFORM_PCI 37 + select PCI 38 select HAS_TXX9_SERIAL 39 select PPC_UDBG_BEAT 40 select USB_OHCI_BIG_ENDIAN_MMIO