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

Commit 373a6da1 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Paul Mackerras
Browse files

[POWERPC] Make non-PCI build work again 



Maple and pasemi both require PCI as does CONFIG_OF_PLATFORM_PCI.
The default setting of CONFIG_ISA_DMA_API is set to match the protection
around the relevant routines in asm/dma.h.

I also had to remove the PMAC platform from the combined build.  The
precis is that to build a 64 bit kernel with no PCI, you can only include
pSeries and iSeries.

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 70fbb938

arch/powerpc/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ config PPC_DCR 


config PPC_OF_PLATFORM_PCI

	bool

	depends on PCI

	depends on PPC64 # not supported on 32 bits yet

	default n
@@ -417,7 +418,7 @@ endmenu 


config ISA_DMA_API

	bool

	default y

	default !PPC_ISERIES || PCI



menu "Bus options"

arch/powerpc/platforms/maple/Kconfig

+1 −0
Original line number Diff line number Diff line 
config PPC_MAPLE

	depends on PPC_MULTIPLATFORM && PPC64

	bool "Maple 970FX Evaluation Board"

	select PCI

	select MPIC

	select U3_DART

	select MPIC_U3_HT_IRQS

arch/powerpc/platforms/pasemi/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ config PPC_PASEMI 
	bool "PA Semi SoC-based platforms"

	default n

	select MPIC

	select PCI

	select PPC_UDBG_16550

	select PPC_NATIVE

	select MPIC_BROKEN_REGREAD