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

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

[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

arch/powerpc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ config MCA 
config PCI

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

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

		|| MPC7448HPC2 || PPC_PS3 || PPC_HOLLY

		|| PPC_PS3

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

		&& !PPC_85xx && !PPC_86xx

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

arch/powerpc/platforms/chrp/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -8,4 +8,5 @@ config PPC_CHRP 
	select PPC_MPC106

	select PPC_UDBG_16550

	select PPC_NATIVE

	select PCI

	default y

arch/powerpc/platforms/chrp/Makefile

+1 −2
Original line number Diff line number Diff line 
obj-y				+= setup.o time.o pegasos_eth.o

obj-$(CONFIG_PCI)		+= pci.o

obj-y				+= setup.o time.o pegasos_eth.o pci.o

obj-$(CONFIG_SMP)		+= smp.o

obj-$(CONFIG_NVRAM)		+= nvram.o

arch/powerpc/platforms/embedded6xx/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ endchoice 
config TSI108_BRIDGE

	bool

	depends on MPC7448HPC2 || PPC_HOLLY

	select PCI

	select MPIC

	select MPIC_WEIRD

	default y

arch/powerpc/platforms/powermac/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ config PPC_PMAC 
	bool "Apple PowerMac based machines"

	depends on PPC_MULTIPLATFORM

	select MPIC

	select PCI

	select PPC_INDIRECT_PCI if PPC32

	select PPC_MPC106 if PPC32

	select PPC_NATIVE