powerpc: Add 82xx/83xx/86xx to 6xx Multiplatform

There isn't any reason at this point that we can't build 82xx, 83xx & 86xx
support in with the other 6xx based boards.  Twiddle the Kconfigs to allow
this.

This allows us to remove the machine type selection for related to 6xx.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

diff --git a/arch/powerpc/platforms/82xx/Kconfig b/arch/powerpc/platforms/82xx/Kconfig
index 917ac889155531eae452b8f39d20ece1385b6154..1c8034bfa796d24b7c89323ba57a55600a58c829 100644 (file)
--- a/arch/powerpc/platforms/82xx/Kconfig
+++ b/arch/powerpc/platforms/82xx/Kconfig
@@ -1,7 +1,8 @@
-choice
-       prompt "82xx Board Type"
-       depends on PPC_82xx
-       default MPC8272_ADS
+menuconfig PPC_82xx
+       bool "82xx-based boards (PQ II)"
+       depends on 6xx && PPC_MULTIPLATFORM
+
+if PPC_82xx
 
 config MPC8272_ADS
        bool "Freescale MPC8272 ADS"
@@ -36,7 +37,7 @@ config EP8248E
          This board is also resold by Freescale as the QUICCStart
          MPC8248 Evaluation System and/or the CWH-PPC-8248N-VE.
 
-endchoice
+endif
 
 config PQ2ADS
        bool

diff --git a/arch/powerpc/platforms/83xx/Kconfig b/arch/powerpc/platforms/83xx/Kconfig
index fe75b2ac3c9f338fef767818f6b66715ddcbe034..27d9bf86de011897fc775ebc7132ae411fa1850a 100644 (file)
--- a/arch/powerpc/platforms/83xx/Kconfig
+++ b/arch/powerpc/platforms/83xx/Kconfig
@@ -1,10 +1,12 @@
-menuconfig MPC83xx
-       bool "83xx Board Type"
-       depends on PPC_83xx
+menuconfig PPC_83xx
+       bool "83xx-based boards"
+       depends on 6xx && PPC_MULTIPLATFORM
        select PPC_UDBG_16550
        select PPC_INDIRECT_PCI
+       select FSL_SOC
+       select IPIC
 
-if MPC83xx
+if PPC_83xx
 
 config MPC831x_RDB
        bool "Freescale MPC831x RDB"

diff --git a/arch/powerpc/platforms/86xx/Kconfig b/arch/powerpc/platforms/86xx/Kconfig
index 053f49a1dcae6ca2a366ff03f77ab5421e5cced2..80a81e02bb55ac820cf440066694f0a8d9e2e9d6 100644 (file)
--- a/arch/powerpc/platforms/86xx/Kconfig
+++ b/arch/powerpc/platforms/86xx/Kconfig
@@ -1,7 +1,13 @@
-choice
-       prompt "86xx Board Type"
-       depends on PPC_86xx
-       default MPC8641_HPCN
+config PPC_86xx
+menuconfig PPC_86xx
+       bool "86xx-based boards"
+       depends on 6xx && PPC_MULTIPLATFORM
+       select FSL_SOC
+       select ALTIVEC
+       help
+         The Freescale E600 SoCs have 74xx cores.
+
+if PPC_86xx
 
 config MPC8641_HPCN
        bool "Freescale MPC8641 HPCN"
@@ -24,7 +30,7 @@ config MPC8610_HPCD
        help
          This option enables support for the MPC8610 HPCD board.
 
-endchoice
+endif
 
 config MPC8641
        bool

diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index 87454c52697326e9173b4f695b46b9e705a77e97..690c1f46e698401c0c1df535fd6f85296d9a31c7 100644 (file)
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -1,36 +1,9 @@
 menu "Platform support"
 
-choice
-       prompt "Machine type"
-       depends on PPC64 || 6xx
-       default PPC_MULTIPLATFORM
-
 config PPC_MULTIPLATFORM
-       bool "Generic desktop/server/laptop"
-       help
-         Select this option if configuring for an IBM pSeries or
-         RS/6000 machine, an Apple machine, or a PReP, CHRP,
-         Maple or Cell-based machine.
-
-config PPC_82xx
-       bool "Freescale 82xx"
-       depends on 6xx
-
-config PPC_83xx
-       bool "Freescale 83xx"
-       depends on 6xx
-       select FSL_SOC
-       select MPC83xx
-       select IPIC
-
-config PPC_86xx
-       bool "Freescale 86xx"
-       depends on 6xx
-       select FSL_SOC
-       select ALTIVEC
-       help
-         The Freescale E600 SoCs have 74xx cores.
-endchoice
+       bool
+       depends on PPC64 || 6xx
+       default y
 
 config CLASSIC32
        def_bool y