Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / arch / ppc / platforms / 85xx / Kconfig

diff --git a/arch/ppc/platforms/85xx/Kconfig b/arch/ppc/platforms/85xx/Kconfig
index e4666df..7ddd331 100644 (file)
--- a/arch/ppc/platforms/85xx/Kconfig
+++ b/arch/ppc/platforms/85xx/Kconfig
@@ -21,6 +21,11 @@ config MPC8540_ADS
        help
          This option enables support for the MPC 8540 ADS evaluation board.
 
+config MPC8548_CDS
+       bool "Freescale MPC8548 CDS"
+       help
+         This option enablese support for the MPC8548 CDS evaluation board.
+
 config MPC8555_CDS
        bool "Freescale MPC8555 CDS"
        help
@@ -34,9 +39,35 @@ config MPC8560_ADS
 config SBC8560
        bool "WindRiver PowerQUICC III SBC8560"
        help
-         This option enables support for the WindRiver PowerQUICC III 
+         This option enables support for the WindRiver PowerQUICC III
          SBC8560 board.
 
+config STX_GP3
+       bool "Silicon Turnkey Express GP3"
+       help
+         This option enables support for the Silicon Turnkey Express GP3
+         board.
+
+config TQM8540
+       bool "TQ Components TQM8540"
+       help
+         This option enablese support for the TQ Components TQM8540 board.
+
+config TQM8541
+       bool "TQ Components TQM8541"
+       help
+         This option enablese support for the TQ Components TQM8541 board.
+
+config TQM8555
+       bool "TQ Components TQM8555"
+       help
+         This option enablese support for the TQ Components TQM8555 board.
+
+config TQM8560
+       bool "TQ Components TQM8560"
+       help
+         This option enablese support for the TQ Components TQM8560 board.
+
 endchoice
 
 # It's often necessary to know the specific 85xx processor type.
@@ -44,17 +75,22 @@ endchoice
 # don't need to ask more redundant questions.
 config MPC8540
        bool
-       depends on MPC8540_ADS
+       depends on MPC8540_ADS || TQM8540
+       default y
+
+config MPC8548
+       bool
+       depends on MPC8548_CDS
        default y
 
 config MPC8555
        bool
-       depends on MPC8555_CDS
+       depends on MPC8555_CDS || TQM8541 || TQM8555
        default y
 
 config MPC8560
        bool
-       depends on SBC8560 || MPC8560_ADS
+       depends on SBC8560 || MPC8560_ADS || STX_GP3 || TQM8560
        default y
 
 config 85xx_PCI2
@@ -62,11 +98,6 @@ config 85xx_PCI2
        depends on MPC8555_CDS
        default y
 
-config FSL_OCP
-       bool
-       depends on 85xx
-       default y
-
 config PPC_GEN550
        bool
        depends on MPC8540 || SBC8560 || MPC8555