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

[pandora-kernel.git] / arch / powerpc / platforms / 85xx / Kconfig

diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
index c3268d9..eb661cc 100644 (file)
--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@ -11,12 +11,25 @@ config MPC8540_ADS
        help
          This option enables support for the MPC 8540 ADS board
 
+config MPC8560_ADS
+       bool "Freescale MPC8560 ADS"
+       select DEFAULT_UIMAGE
+       help
+         This option enables support for the MPC 8560 ADS board
+
 config MPC85xx_CDS
        bool "Freescale MPC85xx CDS"
        select DEFAULT_UIMAGE
        help
          This option enables support for the MPC85xx CDS board
 
+config MPC85xx_MDS
+       bool "Freescale MPC85xx MDS"
+       select DEFAULT_UIMAGE
+#      select QUICC_ENGINE
+       help
+         This option enables support for the MPC85xx MDS board
+
 endchoice
 
 config MPC8540
@@ -25,6 +38,17 @@ config MPC8540
        select PPC_INDIRECT_PCI
        default y if MPC8540_ADS || MPC85xx_CDS
 
+config MPC8560
+       bool
+       select PPC_INDIRECT_PCI
+       default y if MPC8560_ADS
+
+config MPC85xx
+       bool
+       select PPC_UDBG_16550
+       select PPC_INDIRECT_PCI
+       default y if MPC8540_ADS || MPC85xx_CDS || MPC8560_ADS || MPC85xx_MDS
+
 config PPC_INDIRECT_PCI_BE
        bool
        depends on PPC_85xx
@@ -34,4 +58,14 @@ config MPIC
        bool
        default y
 
+config CPM2
+       bool
+       depends on MPC8560
+       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.
+
 endmenu