[POWERPC] CPM2: Make support for the CPM2 optional on 8560 based boards

Currently there is no way to disable the CPM2 support.  Some boards,
like the SBC8560 have their own external UART and don't have any direct
dependencies on the CPM for a serial console or anything else.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
index 06ccb64..333779e 100644 (file)
--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@ -13,6 +13,7 @@ config MPC8560_ADS
        bool "Freescale MPC8560 ADS"
        select DEFAULT_UIMAGE
        select PPC_CPM_NEW_BINDING
+       select CPM2
        help
          This option enables support for the MPC 8560 ADS board
 
@@ -43,6 +44,7 @@ config STX_GP3
        help
          This option enables support for the Silicon Turnkey Express GP3
          board.
+       select CPM2
        select DEFAULT_UIMAGE
        select PPC_CPM_NEW_BINDING
 
@@ -84,7 +86,7 @@ config TQM8560
 config SBC8560
        bool "Wind River SBC8560"
        select DEFAULT_UIMAGE
-       select PPC_CPM_NEW_BINDING
+       select PPC_CPM_NEW_BINDING if CPM2
        help
          This option enables support for the Wind River SBC8560 board
 
@@ -100,11 +102,6 @@ config MPC8540
        select PPC_INDIRECT_PCI
        default y if MPC8540_ADS || MPC85xx_CDS
 
-config MPC8560
-       bool
-       select CPM2
-       default y if MPC8560_ADS || STX_GP3 || SBC8560
-
 config MPC85xx
        bool
        select PPC_UDBG_16550

diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index 4286664..582a3a6 100644 (file)
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -278,8 +278,8 @@ config QUICC_ENGINE
          for a machine with a QE coprocessor.
 
 config CPM2
-       bool
-       default n
+       bool "Enable support for the CPM2 (Communications Processor Module)"
+       depends on MPC85xx || 8260
        select CPM
        select PPC_LIB_RHEAP
        help