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 / 4xx / Kconfig

diff --git a/arch/ppc/platforms/4xx/Kconfig b/arch/ppc/platforms/4xx/Kconfig
index a0612a8..174ddbc 100644 (file)
--- a/arch/ppc/platforms/4xx/Kconfig
+++ b/arch/ppc/platforms/4xx/Kconfig
@@ -3,6 +3,11 @@ config 4xx
        depends on 40x || 44x
        default y
 
+config WANT_EARLY_SERIAL
+       bool
+       select SERIAL_8250
+       default n
+
 menu "IBM 4xx options"
        depends on 4xx
 
@@ -11,13 +16,9 @@ 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
        help
          This option enables support for the IBM 405EP evaluation board.
 
@@ -31,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
@@ -61,6 +57,10 @@ config XILINX_ML300
        help
          This option enables support for the Xilinx ML300 evaluation board.
 
+config XILINX_ML403
+       bool "Xilinx-ML403"
+       help
+         This option enables support for the Xilinx ML403 evaluation board.
 endchoice
 
 choice
@@ -68,18 +68,33 @@ choice
        depends on 44x
        default EBONY
 
+config BAMBOO
+       bool "Bamboo"
+       select WANT_EARLY_SERIAL
+       help
+         This option enables support for the IBM PPC440EP evaluation board.
+
 config EBONY
        bool "Ebony"
+       select WANT_EARLY_SERIAL
        help
          This option enables support for the IBM PPC440GP evaluation board.
 
 config LUAN
        bool "Luan"
+       select WANT_EARLY_SERIAL
        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
        help
          This option enables support for the IBM PPC440GX evaluation board.
 
@@ -98,6 +113,12 @@ config NP405H
        depends on ASH
        default y
 
+config 440EP
+       bool
+       depends on BAMBOO
+       select PPC_FPU
+       default y
+
 config 440GP
        bool
        depends on EBONY
@@ -113,9 +134,14 @@ config 440SP
        depends on LUAN
        default y
 
+config 440SPE
+       bool
+       depends on YUCCA
+       default y
+
 config 440
        bool
-       depends on 440GP || 440SP
+       depends on 440GP || 440SP || 440SPE || 440EP
        default y
 
 config 440A
@@ -123,16 +149,21 @@ config 440A
        depends on 440GX
        default y
 
+config IBM440EP_ERR42
+       bool
+       depends on 440EP
+       default y
+
 # 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
@@ -142,17 +173,12 @@ config BOOKE
 
 config IBM_OCP
        bool
-       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
+       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
@@ -160,6 +186,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
@@ -180,11 +207,21 @@ 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_4_FX
+       bool
+       depends on XILINX_ML403
+       default y
+
+config XILINX_VIRTEX
+       bool
+       depends on XILINX_VIRTEX_II_PRO || XILINX_VIRTEX_4_FX
+       default y
+
 config STB03xxx
        bool
        depends on REDWOOD_5 || REDWOOD_6
@@ -192,12 +229,12 @@ config STB03xxx
 
 config EMBEDDEDBOOT
        bool
-       depends on EP405 || XILINX_ML300
+       depends on EP405 || XILINX_ML300 || XILINX_ML403
        default y
 
 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
@@ -214,10 +251,6 @@ config PPC_GEN550
        depends on 4xx
        default y
 
-config PM
-       bool "Power Management support (EXPERIMENTAL)"
-       depends on 4xx && EXPERIMENTAL
-
 choice
        prompt "TTYS0 device and default console"
        depends on 40x