[POWERPC] Convert 82xx platform to unified platform Kconfig

Moved 82xx platform Kconfig over to being sourced by the unified
arch/powerpc/platforms/Kconfig.  Also, cleaned up whitespace issues in 82xx
Kconfig.

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

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 8576ff3344cc358ba84d0669d2ce9e514cf6e17e..659b41ff4a8695952729669a293039af0f3b11af 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -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/82xx/Kconfig
 source arch/powerpc/platforms/85xx/Kconfig
 source arch/powerpc/platforms/8xx/Kconfig
 

diff --git a/arch/powerpc/platforms/82xx/Kconfig b/arch/powerpc/platforms/82xx/Kconfig
index 411071686f2019279f7673aa60eeb768bc32714d..de7fce9cb6eb8b632e0efb7f2b2c1b1b00409e62 100644 (file)
--- a/arch/powerpc/platforms/82xx/Kconfig
+++ b/arch/powerpc/platforms/82xx/Kconfig
@@ -1,56 +1,36 @@
-menu "Platform support"
-       depends on PPC_82xx
-
 choice
-       prompt "Machine Type"
-       default MPC82xx_ADS
+       prompt "Machine Type"
+       depends on PPC_82xx
+       default MPC82xx_ADS
 
 config MPC82xx_ADS
-       bool "Freescale MPC82xx ADS"
-       select DEFAULT_UIMAGE
-       select PQ2ADS
-       select 8272
-       select 8260
-       select CPM2
-       select FSL_SOC
-       help
-         This option enables support for the MPC8272 ADS board
+       bool "Freescale MPC82xx ADS"
+       select DEFAULT_UIMAGE
+       select PQ2ADS
+       select 8272
+       select 8260
+       select FSL_SOC
+       help
+       This option enables support for the MPC8272 ADS board
 
 endchoice
 
 config PQ2ADS
        bool
-       depends on ADS8272
-       default y
-
-config ADS8272
-       bool
+       default n
 
 config 8260
-       bool "CPM2 Support" if WILLOW
+       bool
        depends on 6xx
-       default y if PQ2FADS
+       select CPM2
        help
-         The MPC8260 is a typical embedded CPU made by Motorola.  Selecting
+         The MPC8260 is a typical embedded CPU made by Freescale.  Selecting
          this option means that you wish to build a kernel for a machine with
          an 8260 class CPU.
 
 config 8272
        bool
-       depends on 6xx
-       default y if ADS8272
        select 8260
        help
          The MPC8272 CPM has a different internal dpram setup than other CPM2
          devices
-
-config CPM2
-       bool
-       depends on 8260 || MPC8560 || MPC8555
-       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 (826x, 827x, 8560).
-endmenu

diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index d686806f96210b2afe4881f195b777d0bab80ffe..efa3a03f76d45e63117bc5b7dac328bb03ca2a88 100644 (file)
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -1,5 +1,5 @@
 menu "Platform support"
-       depends on PPC64 || CLASSIC32 || PPC_83xx || PPC_86xx
+       depends on PPC64 || CLASSIC32 || PPC_82xx || PPC_83xx || 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/82xx/Kconfig"
 source "arch/powerpc/platforms/83xx/Kconfig"
 source "arch/powerpc/platforms/86xx/Kconfig"
 
@@ -221,4 +222,13 @@ config TAU_AVERAGE
 
          If in doubt, say N here.
 
+config CPM2
+       bool
+       default n
+       help
+         The CPM2 (Communications Processor Module) is a coprocessor on
+         embedded CPUs made by Freescale.  Selecting this option means that
+         you wish to build a kernel for a machine with a CPM2 coprocessor
+         on it (826x, 827x, 8560).
+
 endmenu