public inbox for linuxppc-dev@ozlabs.org 
 help / color / mirror / Atom feed
* [PATCH] powerpc/cell: Select PCI for IBM_CELL_BLADE AND CELLEB
@ 2009-04-23  8:43 Michael Ellerman
  2009-04-23 11:07 ` Arnd Bergmann
  0 siblings, 1 reply; 2+ messages in thread
From: Michael Ellerman @ 2009-04-23  8:43 UTC (permalink / raw)
  To: linuxppc-dev; +Cc: Geert.Uytterhoeven, randy.dunlap, subrata, Arnd Bergmann

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>
---
 arch/powerpc/platforms/cell/Kconfig |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/platforms/cell/Kconfig b/arch/powerpc/platforms/cell/Kconfig
index 40e24c3..50f17bd 100644
--- a/arch/powerpc/platforms/cell/Kconfig
+++ b/arch/powerpc/platforms/cell/Kconfig
@@ -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
-- 
1.6.2.1

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] powerpc/cell: Select PCI for IBM_CELL_BLADE AND CELLEB
  2009-04-23  8:43 [PATCH] powerpc/cell: Select PCI for IBM_CELL_BLADE AND CELLEB Michael Ellerman
@ 2009-04-23 11:07 ` Arnd Bergmann
  0 siblings, 0 replies; 2+ messages in thread
From: Arnd Bergmann @ 2009-04-23 11:07 UTC (permalink / raw)
  To: Michael Ellerman; +Cc: Geert.Uytterhoeven, linuxppc-dev, randy.dunlap, subrata

On Thursday 23 April 2009, Michael Ellerman wrote:
> 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>

Yes, this one looks right, thanks for following up on this.

Acked-by: Arnd Bergmann <arnd@arndb•de>

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2009-04-23 11:09 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-04-23  8:43 [PATCH] powerpc/cell: Select PCI for IBM_CELL_BLADE AND CELLEB Michael Ellerman
2009-04-23 11:07 ` Arnd Bergmann

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox