Commit d3c7ffab authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Kumar Gala

[POWERPC] disallow building powermac and tsi108 without PCI

The TSI108 code and the 32 bit powermac and chrp platforms
have dependency on PCI that is not easy or desirable to get rid
of.

The easiest fix is to always select CONFIG_PCI if one of those
platforms is enabled.
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent d6658408
...@@ -430,7 +430,7 @@ config MCA ...@@ -430,7 +430,7 @@ config MCA
config PCI config PCI
bool "PCI support" if 40x || CPM2 || PPC_83xx || PPC_85xx || PPC_86xx \ bool "PCI support" if 40x || CPM2 || PPC_83xx || PPC_85xx || PPC_86xx \
|| PPC_MPC52xx || (EMBEDDED && (PPC_PSERIES || PPC_ISERIES)) \ || PPC_MPC52xx || (EMBEDDED && (PPC_PSERIES || PPC_ISERIES)) \
|| MPC7448HPC2 || PPC_PS3 || PPC_HOLLY || PPC_PS3
default y if !40x && !CPM2 && !8xx && !PPC_83xx \ default y if !40x && !CPM2 && !8xx && !PPC_83xx \
&& !PPC_85xx && !PPC_86xx && !PPC_85xx && !PPC_86xx
default PCI_PERMEDIA if !4xx && !CPM2 && !8xx default PCI_PERMEDIA if !4xx && !CPM2 && !8xx
......
...@@ -8,4 +8,5 @@ config PPC_CHRP ...@@ -8,4 +8,5 @@ config PPC_CHRP
select PPC_MPC106 select PPC_MPC106
select PPC_UDBG_16550 select PPC_UDBG_16550
select PPC_NATIVE select PPC_NATIVE
select PCI
default y default y
obj-y += setup.o time.o pegasos_eth.o obj-y += setup.o time.o pegasos_eth.o pci.o
obj-$(CONFIG_PCI) += pci.o
obj-$(CONFIG_SMP) += smp.o obj-$(CONFIG_SMP) += smp.o
obj-$(CONFIG_NVRAM) += nvram.o obj-$(CONFIG_NVRAM) += nvram.o
...@@ -45,6 +45,7 @@ endchoice ...@@ -45,6 +45,7 @@ endchoice
config TSI108_BRIDGE config TSI108_BRIDGE
bool bool
depends on MPC7448HPC2 || PPC_HOLLY depends on MPC7448HPC2 || PPC_HOLLY
select PCI
select MPIC select MPIC
select MPIC_WEIRD select MPIC_WEIRD
default y default y
......
...@@ -2,6 +2,7 @@ config PPC_PMAC ...@@ -2,6 +2,7 @@ config PPC_PMAC
bool "Apple PowerMac based machines" bool "Apple PowerMac based machines"
depends on PPC_MULTIPLATFORM depends on PPC_MULTIPLATFORM
select MPIC select MPIC
select PCI
select PPC_INDIRECT_PCI if PPC32 select PPC_INDIRECT_PCI if PPC32
select PPC_MPC106 if PPC32 select PPC_MPC106 if PPC32
select PPC_NATIVE select PPC_NATIVE
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment