Commit db947808 authored by Kumar Gala's avatar Kumar Gala
Browse files

[POWERPC] Convert 85xx platform to unified platform Kconfig 



Moved 85xx platform Kconfig over to being sourced by the unified
arch/powerpc/platforms/Kconfig.

Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent c8a55f3d

arch/powerpc/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -377,7 +377,6 @@ source "arch/powerpc/platforms/Kconfig" 


source arch/powerpc/platforms/embedded6xx/Kconfig

source arch/powerpc/platforms/4xx/Kconfig

source arch/powerpc/platforms/85xx/Kconfig



menu "Kernel options"

arch/powerpc/platforms/85xx/Kconfig

+4 −25
Original line number Diff line number Diff line 
menu "Platform support"

	depends on PPC_85xx



choice

	prompt "Machine Type"

	depends on PPC_85xx

	default MPC8540_ADS



config MPC8540_ADS
@@ -46,33 +44,14 @@ config MPC8540 


config MPC8560

	bool

	select PPC_INDIRECT_PCI

	select CPM2

	default y if MPC8560_ADS



config MPC85xx

	bool

	select PPC_UDBG_16550

	select PPC_INDIRECT_PCI

	select PPC_INDIRECT_PCI_BE

	select MPIC

	default y if MPC8540_ADS || MPC85xx_CDS || MPC8560_ADS \

		|| MPC85xx_MDS || MPC8544_DS
 


config PPC_INDIRECT_PCI_BE

	bool

	depends on PPC_85xx

	default y



config MPIC

	bool

	default y



config CPM2

	bool

	depends on MPC8560

	default y

	help

	  The CPM2 (Communications Processor Module) is a coprocessor on

	  embedded CPUs made by Motorola.  Selecting this option means that

	  you wish to build a kernel for a machine with a CPM2 coprocessor

	  on it.



endmenu

arch/powerpc/platforms/Kconfig

+2 −1
Original line number Diff line number Diff line 
menu "Platform support"

	depends on PPC64 || CLASSIC32 || PPC_8xx || PPC_82xx || PPC_83xx || \

			PPC_86xx

			PPC_85xx || PPC_86xx



choice

	prompt "Machine type"
@@ -49,6 +49,7 @@ source arch/powerpc/platforms/cell/Kconfig 
source "arch/powerpc/platforms/8xx/Kconfig"

source "arch/powerpc/platforms/82xx/Kconfig"

source "arch/powerpc/platforms/83xx/Kconfig"

source "arch/powerpc/platforms/85xx/Kconfig"

source "arch/powerpc/platforms/86xx/Kconfig"



config PPC_NATIVE