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

Commit 25635c71 authored by Paul Mackerras's avatar Paul Mackerras
Browse files

ppc: Use the indirect_pci.c from arch/powerpc/sysdev 



This defines a CONFIG_INDIRECT_PCI symbol to control whether it
gets used or not, and fixes the Kconfig to select that symbol for
platforms that need it.

Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent d9953105

arch/powerpc/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -280,11 +280,13 @@ config PPC_PSERIES 
config PPC_CHRP

	bool "  Common Hardware Reference Platform (CHRP) based machines"

	depends on PPC_MULTIPLATFORM && PPC32

	select PPC_INDIRECT_PCI

	default y



config PPC_PMAC

	bool "  Apple PowerMac based machines"

	depends on PPC_MULTIPLATFORM

	select PPC_INDIRECT_PCI if PPC32

	default y



config PPC_PMAC64
@@ -296,6 +298,7 @@ config PPC_PMAC64 
config PPC_PREP

	bool "  PowerPC Reference Platform (PReP) based machines"

	depends on PPC_MULTIPLATFORM && PPC32

	select PPC_INDIRECT_PCI

	default y



config PPC_MAPLE
@@ -637,6 +640,12 @@ config GENERIC_ISA_DMA 
	depends on PPC64 || POWER4 || 6xx && !CPM2

	default y



config PPC_INDIRECT_PCI

	bool

	depends on PCI

	default y if 40x || 44x || 85xx || 83xx

	default n



config EISA

	bool
@@ -677,6 +686,7 @@ config PCI_QSPAN 
config PCI_8260

	bool

	depends on PCI && 8260

	select PPC_INDIRECT_PCI

	default y



config 8260_PCI9

arch/powerpc/platforms/embedded6xx/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ config CHESTNUT 


config SPRUCE

	bool "IBM-Spruce"

	select PPC_INDIRECT_PCI



config HDPU

	bool "Sky-HDPU"
@@ -50,15 +51,19 @@ config LOPEC 


config MVME5100

	bool "Motorola-MVME5100"

	select PPC_INDIRECT_PCI



config PPLUS

	bool "Motorola-PowerPlus"

	select PPC_INDIRECT_PCI



config PRPMC750

	bool "Motorola-PrPMC750"

	select PPC_INDIRECT_PCI



config PRPMC800

	bool "Motorola-PrPMC800"

	select PPC_INDIRECT_PCI



config SANDPOINT

	bool "Motorola-Sandpoint"
@@ -74,6 +79,7 @@ config PAL4 


config GEMINI

	bool "Synergy-Gemini"

	select PPC_INDIRECT_PCI

	depends on BROKEN

	help

	  Select Gemini if configuring for a Synergy Microsystems' Gemini
@@ -226,6 +232,7 @@ config MV64360 # Really MV64360 & MV64460 
config MV64X60

	bool

	depends on (GT64260 || MV64360)

	select PPC_INDIRECT_PCI

	default y



menu "Set bridge options"
@@ -274,6 +281,7 @@ config EPIC_SERIAL_MODE 
config MPC10X_BRIDGE

	bool

	depends on POWERPMC250 || LOPEC || SANDPOINT

	select PPC_INDIRECT_PCI

	default y



config MPC10X_OPENPIC

arch/powerpc/sysdev/Makefile

+1 −2
Original line number Diff line number Diff line 
obj-$(CONFIG_MPIC)		+= mpic.o

indirectpci-$(CONFIG_PPC_PMAC)	= indirect_pci.o

obj-$(CONFIG_PPC32)		+= $(indirectpci-y)
 
obj-$(CONFIG_PPC_INDIRECT_PCI)	+= indirect_pci.o

arch/ppc/Kconfig

+18 −0
Original line number Diff line number Diff line
@@ -568,6 +568,7 @@ config CHESTNUT 


config SPRUCE

	bool "IBM-Spruce"

	select PPC_INDIRECT_PCI



config HDPU

	bool "Sky-HDPU"
@@ -591,15 +592,19 @@ config LOPEC 


config MVME5100

	bool "Motorola-MVME5100"

	select PPC_INDIRECT_PCI



config PPLUS

	bool "Motorola-PowerPlus"

	select PPC_INDIRECT_PCI



config PRPMC750

	bool "Motorola-PrPMC750"

	select PPC_INDIRECT_PCI



config PRPMC800

	bool "Motorola-PrPMC800"

	select PPC_INDIRECT_PCI



config SANDPOINT

	bool "Motorola-Sandpoint"
@@ -616,6 +621,7 @@ config PAL4 
config GEMINI

	bool "Synergy-Gemini"

	depends on BROKEN

	select PPC_INDIRECT_PCI

	help

	  Select Gemini if configuring for a Synergy Microsystems' Gemini

	  series Single Board Computer.  More information is available at:
@@ -749,11 +755,13 @@ config CPM2 
config PPC_CHRP

	bool "  Common Hardware Reference Platform (CHRP) based machines"

	depends on PPC_MULTIPLATFORM

	select PPC_INDIRECT_PCI

	default y



config PPC_PMAC

	bool "  Apple PowerMac based machines"

	depends on PPC_MULTIPLATFORM

	select PPC_INDIRECT_PCI

	default y



config PPC_PMAC64
@@ -764,6 +772,7 @@ config PPC_PMAC64 
config PPC_PREP

	bool "  PowerPC Reference Platform (PReP) based machines"

	depends on PPC_MULTIPLATFORM

	select PPC_INDIRECT_PCI

	default y



config PPC_OF
@@ -797,6 +806,7 @@ config MV64360 # Really MV64360 & MV64460 
config MV64X60

	bool

	depends on (GT64260 || MV64360)

	select PPC_INDIRECT_PCI

	default y



menu "Set bridge options"
@@ -845,6 +855,7 @@ config EPIC_SERIAL_MODE 
config MPC10X_BRIDGE

	bool

	depends on POWERPMC250 || LOPEC || SANDPOINT

	select PPC_INDIRECT_PCI

	default y



config MPC10X_OPENPIC
@@ -1139,6 +1150,12 @@ config GENERIC_ISA_DMA 
	depends on POWER3 || POWER4 || 6xx && !CPM2

	default y



config PPC_INDIRECT_PCI

	bool

	depends on PCI

	default y if 40x || 44x || 85xx || 83xx

	default n



config EISA

	bool

	help
@@ -1182,6 +1199,7 @@ config PCI_QSPAN 
config PCI_8260

	bool

	depends on PCI && 8260

	select PPC_INDIRECT_PCI

	default y



config 8260_PCI9

arch/ppc/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -61,7 +61,8 @@ head-$(CONFIG_PPC_FPU) += arch/powerpc/kernel/fpu.o 


core-y				+= arch/ppc/kernel/ arch/powerpc/kernel/ \

				   arch/ppc/platforms/ \

				   arch/ppc/mm/ arch/ppc/lib/ arch/ppc/syslib/

				   arch/ppc/mm/ arch/ppc/lib/ \

				   arch/ppc/syslib/ arch/powerpc/sysdev/

core-$(CONFIG_4xx)		+= arch/ppc/platforms/4xx/

core-$(CONFIG_83xx)		+= arch/ppc/platforms/83xx/

core-$(CONFIG_85xx)		+= arch/ppc/platforms/85xx/