[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: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
parent
70fbb93883
commit
373a6da165
|
@ -160,6 +160,7 @@ config PPC_DCR
|
||||||
|
|
||||||
config PPC_OF_PLATFORM_PCI
|
config PPC_OF_PLATFORM_PCI
|
||||||
bool
|
bool
|
||||||
|
depends on PCI
|
||||||
depends on PPC64 # not supported on 32 bits yet
|
depends on PPC64 # not supported on 32 bits yet
|
||||||
default n
|
default n
|
||||||
|
|
||||||
|
@ -417,7 +418,7 @@ endmenu
|
||||||
|
|
||||||
config ISA_DMA_API
|
config ISA_DMA_API
|
||||||
bool
|
bool
|
||||||
default y
|
default !PPC_ISERIES || PCI
|
||||||
|
|
||||||
menu "Bus options"
|
menu "Bus options"
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
config PPC_MAPLE
|
config PPC_MAPLE
|
||||||
depends on PPC_MULTIPLATFORM && PPC64
|
depends on PPC_MULTIPLATFORM && PPC64
|
||||||
bool "Maple 970FX Evaluation Board"
|
bool "Maple 970FX Evaluation Board"
|
||||||
|
select PCI
|
||||||
select MPIC
|
select MPIC
|
||||||
select U3_DART
|
select U3_DART
|
||||||
select MPIC_U3_HT_IRQS
|
select MPIC_U3_HT_IRQS
|
||||||
|
|
|
@ -3,6 +3,7 @@ config PPC_PASEMI
|
||||||
bool "PA Semi SoC-based platforms"
|
bool "PA Semi SoC-based platforms"
|
||||||
default n
|
default n
|
||||||
select MPIC
|
select MPIC
|
||||||
|
select PCI
|
||||||
select PPC_UDBG_16550
|
select PPC_UDBG_16550
|
||||||
select PPC_NATIVE
|
select PPC_NATIVE
|
||||||
select MPIC_BROKEN_REGREAD
|
select MPIC_BROKEN_REGREAD
|
||||||
|
|
Loading…
Reference in New Issue