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>

arch/powerpc/platforms/82xx/Kconfig

@@ -1,7 +1,8 @@
-choice
+menuconfig PPC_82xx
-	prompt "82xx Board Type"
+	bool "82xx-based boards (PQ II)"
-	depends on PPC_82xx
+	depends on 6xx && PPC_MULTIPLATFORM
-	default MPC8272_ADS
+
+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

arch/powerpc/platforms/83xx/Kconfig

@@ -1,10 +1,12 @@
-menuconfig MPC83xx
+menuconfig PPC_83xx
-	bool "83xx Board Type"
+	bool "83xx-based boards"
-	depends on PPC_83xx
+	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"

arch/powerpc/platforms/86xx/Kconfig

@@ -1,7 +1,13 @@
-choice
+config PPC_86xx
-	prompt "86xx Board Type"
+menuconfig PPC_86xx
-	depends on PPC_86xx
+	bool "86xx-based boards"
-	default MPC8641_HPCN
+	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

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"
+	bool
-	help
+	depends on PPC64 || 6xx
-	  Select this option if configuring for an IBM pSeries or
+	default y
-	  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
 
 config CLASSIC32
 	def_bool y