aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2008-01-24 18:41:25 -0500
committerKumar Gala <galak@kernel.crashing.org>2008-01-28 09:30:48 -0500
commitb8b3caf3b4ccce2c492b1c9a0d13697c41cc8fe1 (patch)
treed9da5ddc81384dd39e3209a6b5e840051de36fb3 /arch/powerpc
parent6a35b6f09b8ef19ac99342951e49e3b242b5093b (diff)
[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>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/platforms/85xx/Kconfig9
-rw-r--r--arch/powerpc/platforms/Kconfig4
2 files changed, 5 insertions, 8 deletions
diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
index 06ccb64293e2..333779ee5f1e 100644
--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@ -13,6 +13,7 @@ config MPC8560_ADS
13 bool "Freescale MPC8560 ADS" 13 bool "Freescale MPC8560 ADS"
14 select DEFAULT_UIMAGE 14 select DEFAULT_UIMAGE
15 select PPC_CPM_NEW_BINDING 15 select PPC_CPM_NEW_BINDING
16 select CPM2
16 help 17 help
17 This option enables support for the MPC 8560 ADS board 18 This option enables support for the MPC 8560 ADS board
18 19
@@ -43,6 +44,7 @@ config STX_GP3
43 help 44 help
44 This option enables support for the Silicon Turnkey Express GP3 45 This option enables support for the Silicon Turnkey Express GP3
45 board. 46 board.
47 select CPM2
46 select DEFAULT_UIMAGE 48 select DEFAULT_UIMAGE
47 select PPC_CPM_NEW_BINDING 49 select PPC_CPM_NEW_BINDING
48 50
@@ -84,7 +86,7 @@ config TQM8560
84config SBC8560 86config SBC8560
85 bool "Wind River SBC8560" 87 bool "Wind River SBC8560"
86 select DEFAULT_UIMAGE 88 select DEFAULT_UIMAGE
87 select PPC_CPM_NEW_BINDING 89 select PPC_CPM_NEW_BINDING if CPM2
88 help 90 help
89 This option enables support for the Wind River SBC8560 board 91 This option enables support for the Wind River SBC8560 board
90 92
@@ -100,11 +102,6 @@ config MPC8540
100 select PPC_INDIRECT_PCI 102 select PPC_INDIRECT_PCI
101 default y if MPC8540_ADS || MPC85xx_CDS 103 default y if MPC8540_ADS || MPC85xx_CDS
102 104
103config MPC8560
104 bool
105 select CPM2
106 default y if MPC8560_ADS || STX_GP3 || SBC8560
107
108config MPC85xx 105config MPC85xx
109 bool 106 bool
110 select PPC_UDBG_16550 107 select PPC_UDBG_16550
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index 4286664741dd..582a3a6ce0a1 100644
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -278,8 +278,8 @@ config QUICC_ENGINE
278 for a machine with a QE coprocessor. 278 for a machine with a QE coprocessor.
279 279
280config CPM2 280config CPM2
281 bool 281 bool "Enable support for the CPM2 (Communications Processor Module)"
282 default n 282 depends on MPC85xx || 8260
283 select CPM 283 select CPM
284 select PPC_LIB_RHEAP 284 select PPC_LIB_RHEAP
285 help 285 help