Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm

[linux-2.6-omap-h63xx.git] / arch / powerpc / platforms / 82xx / Kconfig

diff --git a/arch/powerpc/platforms/82xx/Kconfig b/arch/powerpc/platforms/82xx/Kconfig
index 411071686f2019279f7673aa60eeb768bc32714d..89fde43895c505c678304707c7ded6b579322db9 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 "82xx Board 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