[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: Kumar Gala <galak@kernel.crashing.org>

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 740892a13c767baccc9f94fb43c07964eb362ac8..d37e0b89eb0b1d5cffe1a2456c119b05c84e6499 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -380,7 +380,6 @@ source arch/powerpc/platforms/4xx/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
 source arch/powerpc/platforms/8xx/Kconfig
 
 menu "Kernel options"
@@ -637,6 +636,11 @@ config PPC_INDIRECT_PCI
        default y if 40x || 44x
        default n
 
+config PPC_INDIRECT_PCI_BE
+       bool
+       depends PPC_INDIRECT_PCI
+       default n
+
 config EISA
        bool
 

diff --git a/arch/powerpc/platforms/86xx/Kconfig b/arch/powerpc/platforms/86xx/Kconfig
index 0c70944d0e37464825b19fe2a68d4dafdc1863e1..d1bcff5004645ea33ca237a55c32e9ad8c04d9c4 100644 (file)
--- a/arch/powerpc/platforms/86xx/Kconfig
+++ b/arch/powerpc/platforms/86xx/Kconfig
@@ -1,8 +1,6 @@
-menu "Platform Support"
-       depends on PPC_86xx
-
 choice
        prompt "Machine Type"
+       depends on PPC_86xx
        default MPC8641_HPCN
 
 config MPC8641_HPCN
@@ -14,20 +12,10 @@ config MPC8641_HPCN
 
 endchoice
 
-
 config MPC8641
        bool
        select PPC_INDIRECT_PCI
+       select PPC_INDIRECT_PCI_BE
        select PPC_UDBG_16550
+       select MPIC
        default y if MPC8641_HPCN
-
-config MPIC
-       bool
-       default y
-
-config PPC_INDIRECT_PCI_BE
-       bool
-       depends on PPC_86xx
-       default y
-
-endmenu

diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index 176a27ff8f687f02b90ea5b35e4cfaccfa6b8364..5f2cef0719196ad366e66f162c276ec567b4ddfa 100644 (file)
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -1,5 +1,5 @@
 menu "Platform support"
-       depends on PPC64 || CLASSIC32
+       depends on PPC64 || CLASSIC32 || PPC_86xx
 
 choice
        prompt "Machine type"
@@ -45,6 +45,7 @@ source "arch/powerpc/platforms/pasemi/Kconfig"
 source arch/powerpc/platforms/celleb/Kconfig
 source arch/powerpc/platforms/ps3/Kconfig
 source arch/powerpc/platforms/cell/Kconfig
+source "arch/powerpc/platforms/86xx/Kconfig"
 
 config PPC_NATIVE
        bool