[PATCH] powerpc: Migrate Xilinx Vertex support from the OCP bus to the platfom bus.

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

diff --git a/arch/ppc/platforms/4xx/Kconfig b/arch/ppc/platforms/4xx/Kconfig
index 805dd98908a3cd4e90164f2e0c1cde80d0c8ef5e..057c7c2ab99de76fc087587b38400511cefb3380 100644 (file)
--- a/arch/ppc/platforms/4xx/Kconfig
+++ b/arch/ppc/platforms/4xx/Kconfig
@@ -16,11 +16,6 @@ choice
        depends on 40x
        default WALNUT
 
-config ASH
-       bool "Ash"
-       help
-         This option enables support for the IBM NP405H evaluation board.
-
 config BUBINGA
        bool "Bubinga"
        select WANT_EARLY_SERIAL
@@ -37,11 +32,6 @@ config EP405
        help
          This option enables support for the EP405/EP405PC boards.
 
-config OAK
-       bool "Oak"
-       help
-         This option enables support for the IBM 403GCX evaluation board.
-
 config REDWOOD_5
        bool "Redwood-5"
        help
@@ -92,6 +82,12 @@ config LUAN
        help
          This option enables support for the IBM PPC440SP evaluation board.
 
+config YUCCA
+       bool "Yucca"
+       select WANT_EARLY_SERIAL
+       help
+         This option enables support for the AMCC PPC440SPe evaluation board.
+
 config OCOTEA
        bool "Ocotea"
        select WANT_EARLY_SERIAL
@@ -134,9 +130,14 @@ config 440SP
        depends on LUAN
        default y
 
+config 440SPE
+       bool
+       depends on YUCCA
+       default y
+
 config 440
        bool
-       depends on 440GP || 440SP || 440EP
+       depends on 440GP || 440SP || 440SPE || 440EP
        default y
 
 config 440A
@@ -152,13 +153,13 @@ config IBM440EP_ERR42
 # All 405-based cores up until the 405GPR and 405EP have this errata.
 config IBM405_ERR77
        bool
-       depends on 40x && !403GCX && !405GPR
+       depends on 40x && !403GCX && !405GPR && !405EP
        default y
 
 # All 40x-based cores, up until the 405GPR and 405EP have this errata.
 config IBM405_ERR51
        bool
-       depends on 40x && !405GPR
+       depends on 40x && !405GPR && !405EP
        default y
 
 config BOOKE
@@ -168,17 +169,12 @@ config BOOKE
 
 config IBM_OCP
        bool
-       depends on ASH || BAMBOO || BUBINGA || CPCI405 || EBONY || EP405 || LUAN || OCOTEA || REDWOOD_5 || REDWOOD_6 || SYCAMORE || WALNUT
-       default y
-
-config XILINX_OCP
-       bool
-       depends on XILINX_ML300
+       depends on ASH || BAMBOO || BUBINGA || CPCI405 || EBONY || EP405 || LUAN || YUCCA || OCOTEA || REDWOOD_5 || REDWOOD_6 || SYCAMORE || WALNUT
        default y
 
 config IBM_EMAC4
        bool
-       depends on 440GX || 440SP
+       depends on 440GX || 440SP || 440SPE
        default y
 
 config BIOS_FIXUP
@@ -186,6 +182,7 @@ config BIOS_FIXUP
        depends on BUBINGA || EP405 || SYCAMORE || WALNUT
        default y
 
+# OAK doesn't exist but wanted to keep this around for any future 403GCX boards
 config 403GCX
        bool
        depends OAK
@@ -206,11 +203,16 @@ config 405GPR
        depends on SYCAMORE
        default y
 
-config VIRTEX_II_PRO
+config XILINX_VIRTEX_II_PRO
        bool
        depends on XILINX_ML300
        default y
 
+config XILINX_VIRTEX
+       bool
+       depends on XILINX_VIRTEX_II_PRO
+       default y
+
 config STB03xxx
        bool
        depends on REDWOOD_5 || REDWOOD_6
@@ -223,7 +225,7 @@ config EMBEDDEDBOOT
 
 config IBM_OPENBIOS
        bool
-       depends on ASH || BUBINGA || REDWOOD_5 || REDWOOD_6 || SYCAMORE || WALNUT
+       depends on ASH || REDWOOD_5 || REDWOOD_6
        default y
 
 config PPC4xx_DMA