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: John Rigby <jrigby@freescale.com> Acked-by: Grant Likely <grant.likely@secretlab.ca> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
parent
36aa7965d8
commit
b500563b22
|
@ -568,11 +568,15 @@ config FSL_GTM
|
||||||
config MCA
|
config MCA
|
||||||
bool
|
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
|
config PCI
|
||||||
bool "PCI support" if 40x || CPM2 || PPC_83xx || PPC_85xx || PPC_86xx \
|
bool "PCI support" if PPC_PCI_CHOICE
|
||||||
|| PPC_MPC52xx || (EMBEDDED && (PPC_PSERIES || PPC_ISERIES)) \
|
default y if !40x && !CPM2 && !8xx && !PPC_83xx \
|
||||||
|| PPC_PS3 || 44x
|
|
||||||
default y if !40x && !CPM2 && !8xx && !PPC_MPC512x && !PPC_83xx \
|
|
||||||
&& !PPC_85xx && !PPC_86xx
|
&& !PPC_85xx && !PPC_86xx
|
||||||
default PCI_PERMEDIA if !4xx && !CPM2 && !8xx
|
default PCI_PERMEDIA if !4xx && !CPM2 && !8xx
|
||||||
default PCI_QSPAN if !4xx && !CPM2 && 8xx
|
default PCI_QSPAN if !4xx && !CPM2 && 8xx
|
||||||
|
|
|
@ -3,6 +3,7 @@ config PPC_MPC52xx
|
||||||
depends on PPC_MULTIPLATFORM && PPC32
|
depends on PPC_MULTIPLATFORM && PPC32
|
||||||
select FSL_SOC
|
select FSL_SOC
|
||||||
select PPC_CLOCK
|
select PPC_CLOCK
|
||||||
|
select PPC_PCI_CHOICE
|
||||||
|
|
||||||
config PPC_MPC5200_SIMPLE
|
config PPC_MPC5200_SIMPLE
|
||||||
bool "Generic support for simple MPC5200 based boards"
|
bool "Generic support for simple MPC5200 based boards"
|
||||||
|
|
|
@ -2,6 +2,7 @@ menuconfig PPC_83xx
|
||||||
bool "83xx-based boards"
|
bool "83xx-based boards"
|
||||||
depends on 6xx && PPC_MULTIPLATFORM
|
depends on 6xx && PPC_MULTIPLATFORM
|
||||||
select PPC_UDBG_16550
|
select PPC_UDBG_16550
|
||||||
|
select PPC_PCI_CHOICE
|
||||||
select PPC_INDIRECT_PCI
|
select PPC_INDIRECT_PCI
|
||||||
select FSL_SOC
|
select FSL_SOC
|
||||||
select IPIC
|
select IPIC
|
||||||
|
|
|
@ -2,8 +2,8 @@ menuconfig MPC85xx
|
||||||
bool "Machine Type"
|
bool "Machine Type"
|
||||||
depends on PPC_85xx
|
depends on PPC_85xx
|
||||||
select PPC_UDBG_16550
|
select PPC_UDBG_16550
|
||||||
select PPC_INDIRECT_PCI if PCI
|
|
||||||
select MPIC
|
select MPIC
|
||||||
|
select PPC_PCI_CHOICE
|
||||||
select FSL_PCI if PCI
|
select FSL_PCI if PCI
|
||||||
select SERIAL_8250_SHARE_IRQ if SERIAL_8250
|
select SERIAL_8250_SHARE_IRQ if SERIAL_8250
|
||||||
default y
|
default y
|
||||||
|
|
|
@ -34,6 +34,7 @@ endif
|
||||||
|
|
||||||
config MPC8641
|
config MPC8641
|
||||||
bool
|
bool
|
||||||
|
select PPC_PCI_CHOICE
|
||||||
select FSL_PCI if PCI
|
select FSL_PCI if PCI
|
||||||
select PPC_UDBG_16550
|
select PPC_UDBG_16550
|
||||||
select MPIC
|
select MPIC
|
||||||
|
@ -41,6 +42,7 @@ config MPC8641
|
||||||
|
|
||||||
config MPC8610
|
config MPC8610
|
||||||
bool
|
bool
|
||||||
|
select PPC_PCI_CHOICE
|
||||||
select FSL_PCI if PCI
|
select FSL_PCI if PCI
|
||||||
select PPC_UDBG_16550
|
select PPC_UDBG_16550
|
||||||
select MPIC
|
select MPIC
|
||||||
|
|
|
@ -253,6 +253,7 @@ config CPM2
|
||||||
depends on MPC85xx || 8260
|
depends on MPC85xx || 8260
|
||||||
select CPM
|
select CPM
|
||||||
select PPC_LIB_RHEAP
|
select PPC_LIB_RHEAP
|
||||||
|
select PPC_PCI_CHOICE
|
||||||
help
|
help
|
||||||
The CPM2 (Communications Processor Module) is a coprocessor on
|
The CPM2 (Communications Processor Module) is a coprocessor on
|
||||||
embedded CPUs made by Freescale. Selecting this option means that
|
embedded CPUs made by Freescale. Selecting this option means that
|
||||||
|
|
|
@ -42,12 +42,14 @@ config 40x
|
||||||
select PPC_DCR_NATIVE
|
select PPC_DCR_NATIVE
|
||||||
select PPC_UDBG_16550
|
select PPC_UDBG_16550
|
||||||
select 4xx_SOC
|
select 4xx_SOC
|
||||||
|
select PPC_PCI_CHOICE
|
||||||
|
|
||||||
config 44x
|
config 44x
|
||||||
bool "AMCC 44x"
|
bool "AMCC 44x"
|
||||||
select PPC_DCR_NATIVE
|
select PPC_DCR_NATIVE
|
||||||
select PPC_UDBG_16550
|
select PPC_UDBG_16550
|
||||||
select 4xx_SOC
|
select 4xx_SOC
|
||||||
|
select PPC_PCI_CHOICE
|
||||||
|
|
||||||
config E200
|
config E200
|
||||||
bool "Freescale e200"
|
bool "Freescale e200"
|
||||||
|
|
|
@ -2,6 +2,7 @@ config PPC_ISERIES
|
||||||
bool "IBM Legacy iSeries"
|
bool "IBM Legacy iSeries"
|
||||||
depends on PPC_MULTIPLATFORM && PPC64
|
depends on PPC_MULTIPLATFORM && PPC64
|
||||||
select PPC_INDIRECT_IO
|
select PPC_INDIRECT_IO
|
||||||
|
select PPC_PCI_CHOICE if EMBEDDED
|
||||||
|
|
||||||
menu "iSeries device drivers"
|
menu "iSeries device drivers"
|
||||||
depends on PPC_ISERIES
|
depends on PPC_ISERIES
|
||||||
|
|
|
@ -8,6 +8,7 @@ config PPC_PS3
|
||||||
select USB_ARCH_HAS_EHCI
|
select USB_ARCH_HAS_EHCI
|
||||||
select USB_EHCI_BIG_ENDIAN_MMIO
|
select USB_EHCI_BIG_ENDIAN_MMIO
|
||||||
select MEMORY_HOTPLUG
|
select MEMORY_HOTPLUG
|
||||||
|
select PPC_PCI_CHOICE
|
||||||
help
|
help
|
||||||
This option enables support for the Sony PS3 game console
|
This option enables support for the Sony PS3 game console
|
||||||
and other platforms using the PS3 hypervisor. Enabling this
|
and other platforms using the PS3 hypervisor. Enabling this
|
||||||
|
|
|
@ -7,6 +7,7 @@ config PPC_PSERIES
|
||||||
select RTAS_ERROR_LOGGING
|
select RTAS_ERROR_LOGGING
|
||||||
select PPC_UDBG_16550
|
select PPC_UDBG_16550
|
||||||
select PPC_NATIVE
|
select PPC_NATIVE
|
||||||
|
select PPC_PCI_CHOICE if EMBEDDED
|
||||||
default y
|
default y
|
||||||
|
|
||||||
config PPC_SPLPAR
|
config PPC_SPLPAR
|
||||||
|
|
Loading…
Reference in New Issue