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

Commit b500563b authored by John Rigby's avatar John Rigby Committed by Kumar Gala
Browse files

powerpc: pci config cleanup 



Choosing PCI or not at config time is allowed on some
platforms via an if expression in arch/powerpc/Kconfig.
To add a new platform with PCI support selectable at
config time, you must change the if expression.  This
patch makes this easier by changing:
    bool "PCI support" if <long expression>
to
    bool "PCI support" if PPC_PCI_CHOICE
and adding select PPC_PCI_CHOICE to all the config nodes that
were previously in the PCI if expression.

Platforms with unconditional PCI support continue to
just select PCI in their config nodes.

Signed-off-by: default avatarJohn Rigby <jrigby@freescale.com>
Acked-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent 36aa7965

arch/powerpc/Kconfig

+8 −4
Original line number Diff line number Diff line
@@ -568,11 +568,15 @@ config FSL_GTM 
config MCA

	bool



# Platforms that what PCI turned unconditionally just do select PCI

# in their config node.  Platforms that want to choose at config

# time should select PPC_PCI_CHOICE

config PPC_PCI_CHOICE

	bool



config PCI

	bool "PCI support" if 40x || CPM2 || PPC_83xx || PPC_85xx || PPC_86xx \

		|| PPC_MPC52xx || (EMBEDDED && (PPC_PSERIES || PPC_ISERIES)) \

		|| PPC_PS3 || 44x

	default y if !40x && !CPM2 && !8xx && !PPC_MPC512x && !PPC_83xx \

	bool "PCI support" if PPC_PCI_CHOICE

	default y if !40x && !CPM2 && !8xx && !PPC_83xx \

		&& !PPC_85xx && !PPC_86xx

	default PCI_PERMEDIA if !4xx && !CPM2 && !8xx

	default PCI_QSPAN if !4xx && !CPM2 && 8xx

arch/powerpc/platforms/52xx/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ config PPC_MPC52xx 
	depends on PPC_MULTIPLATFORM && PPC32

	select FSL_SOC

	select PPC_CLOCK

	select PPC_PCI_CHOICE



config PPC_MPC5200_SIMPLE

	bool "Generic support for simple MPC5200 based boards"

arch/powerpc/platforms/83xx/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ menuconfig PPC_83xx 
	bool "83xx-based boards"

	depends on 6xx && PPC_MULTIPLATFORM

	select PPC_UDBG_16550

	select PPC_PCI_CHOICE

	select PPC_INDIRECT_PCI

	select FSL_SOC

	select IPIC

arch/powerpc/platforms/85xx/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ menuconfig MPC85xx 
	bool "Machine Type"

	depends on PPC_85xx

	select PPC_UDBG_16550

	select PPC_INDIRECT_PCI if PCI

	select MPIC

	select PPC_PCI_CHOICE

	select FSL_PCI if PCI

	select SERIAL_8250_SHARE_IRQ if SERIAL_8250

	default y

arch/powerpc/platforms/86xx/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ endif 


config MPC8641

	bool

	select PPC_PCI_CHOICE

	select FSL_PCI if PCI

	select PPC_UDBG_16550

	select MPIC
@@ -41,6 +42,7 @@ config MPC8641 


config MPC8610

	bool

	select PPC_PCI_CHOICE

	select FSL_PCI if PCI

	select PPC_UDBG_16550

	select MPIC