vserver 1.9.5.x5

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

diff --git a/arch/ppc/platforms/4xx/Kconfig b/arch/ppc/platforms/4xx/Kconfig
index 578b0ac..a0612a8 100644 (file)
--- a/arch/ppc/platforms/4xx/Kconfig
+++ b/arch/ppc/platforms/4xx/Kconfig
@@ -56,6 +56,11 @@ config WALNUT
        help
          This option enables support for the IBM PPC405GP evaluation board.
 
+config XILINX_ML300
+       bool "Xilinx-ML300"
+       help
+         This option enables support for the Xilinx ML300 evaluation board.
+
 endchoice
 
 choice
@@ -68,6 +73,11 @@ config EBONY
        help
          This option enables support for the IBM PPC440GP evaluation board.
 
+config LUAN
+       bool "Luan"
+       help
+         This option enables support for the IBM PPC440SP evaluation board.
+
 config OCOTEA
        bool "Ocotea"
        help
@@ -98,9 +108,14 @@ config 440GX
        depends on OCOTEA
        default y
 
+config 440SP
+       bool
+       depends on LUAN
+       default y
+
 config 440
        bool
-       depends on 440GP
+       depends on 440GP || 440SP
        default y
 
 config 440A
@@ -127,12 +142,17 @@ config BOOKE
 
 config IBM_OCP
        bool
-       depends on ASH || BUBINGA || CPCI405 || EBONY || EP405 || OCOTEA || REDWOOD_5 || REDWOOD_6 || SYCAMORE || WALNUT
+       depends on ASH || BUBINGA || CPCI405 || EBONY || EP405 || LUAN || OCOTEA || REDWOOD_5 || REDWOOD_6 || SYCAMORE || WALNUT
+       default y
+
+config XILINX_OCP
+       bool
+       depends on XILINX_ML300
        default y
 
 config IBM_EMAC4
        bool
-       depends on 440GX
+       depends on 440GX || 440SP
        default y
 
 config BIOS_FIXUP
@@ -160,6 +180,11 @@ config 405GPR
        depends on SYCAMORE
        default y
 
+config VIRTEX_II_PRO
+       bool
+       depends on XILINX_ML300
+       default y
+
 config STB03xxx
        bool
        depends on REDWOOD_5 || REDWOOD_6
@@ -167,7 +192,7 @@ config STB03xxx
 
 config EMBEDDEDBOOT
        bool
-       depends on EP405
+       depends on EP405 || XILINX_ML300
        default y
 
 config IBM_OPENBIOS
@@ -184,6 +209,11 @@ config PPC4xx_EDMA
        depends on !STB03xxx && PPC4xx_DMA
        default y
 
+config PPC_GEN550
+       bool
+       depends on 4xx
+       default y
+
 config PM
        bool "Power Management support (EXPERIMENTAL)"
        depends on 4xx && EXPERIMENTAL