Commit 4a89f7fa authored by Kumar Gala's avatar Kumar Gala
Browse files

[POWERPC] Convert 86xx platform to unified platform Kconfig 



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

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

arch/powerpc/Kconfig

+5 −1
Original line number Original line Diff line number Diff line
@@ -380,7 +380,6 @@ source arch/powerpc/platforms/4xx/Kconfig 
source arch/powerpc/platforms/82xx/Kconfig

source arch/powerpc/platforms/82xx/Kconfig

source arch/powerpc/platforms/83xx/Kconfig

source arch/powerpc/platforms/83xx/Kconfig

source arch/powerpc/platforms/85xx/Kconfig

source arch/powerpc/platforms/85xx/Kconfig

source arch/powerpc/platforms/86xx/Kconfig

source arch/powerpc/platforms/8xx/Kconfig

source arch/powerpc/platforms/8xx/Kconfig





menu "Kernel options"

menu "Kernel options"
@@ -637,6 +636,11 @@ config PPC_INDIRECT_PCI 
	default y if 40x || 44x

	default y if 40x || 44x

	default n

	default n





config PPC_INDIRECT_PCI_BE

	bool

	depends PPC_INDIRECT_PCI

	default n



config EISA

config EISA

	bool

	bool

arch/powerpc/platforms/86xx/Kconfig

+3 −15
Original line number Original line Diff line number Diff line 
menu "Platform Support"

	depends on PPC_86xx



choice

choice

	prompt "Machine Type"

	prompt "Machine Type"

	depends on PPC_86xx

	default MPC8641_HPCN

	default MPC8641_HPCN





config MPC8641_HPCN

config MPC8641_HPCN
@@ -14,20 +12,10 @@ config MPC8641_HPCN 




endchoice

endchoice







config MPC8641

config MPC8641

	bool

	bool

	select PPC_INDIRECT_PCI

	select PPC_INDIRECT_PCI

	select PPC_INDIRECT_PCI_BE

	select PPC_UDBG_16550

	select PPC_UDBG_16550

	select MPIC

	default y if MPC8641_HPCN
 
	default y if MPC8641_HPCN
 


config MPIC

	bool

	default y



config PPC_INDIRECT_PCI_BE

	bool

	depends on PPC_86xx

	default y



endmenu

arch/powerpc/platforms/Kconfig

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

menu "Platform support"

	depends on PPC64 || CLASSIC32

	depends on PPC64 || CLASSIC32 || PPC_86xx





choice

choice

	prompt "Machine type"

	prompt "Machine type"
@@ -45,6 +45,7 @@ source "arch/powerpc/platforms/pasemi/Kconfig" 
source arch/powerpc/platforms/celleb/Kconfig

source arch/powerpc/platforms/celleb/Kconfig

source arch/powerpc/platforms/ps3/Kconfig

source arch/powerpc/platforms/ps3/Kconfig

source arch/powerpc/platforms/cell/Kconfig

source arch/powerpc/platforms/cell/Kconfig

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





config PPC_NATIVE

config PPC_NATIVE

	bool

	bool