Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[linux-2.6] / arch / powerpc / platforms / 44x / Kconfig

diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig
index 8e66949e7c67c0b391b41e1beeafa57f5112de35..51f3ea40a285be0c24e3aadd1a24034a34857742 100644 (file)
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@ -1,10 +1,10 @@
-#config BAMBOO
-#      bool "Bamboo"
-#      depends on 44x
-#      default n
-#      select 440EP
-#      help
-#        This option enables support for the IBM PPC440EP evaluation board.
+config BAMBOO
+       bool "Bamboo"
+       depends on 44x
+       default n
+       select 440EP
+       help
+         This option enables support for the IBM PPC440EP evaluation board.
 
 config EBONY
        bool "Ebony"
@@ -14,6 +14,14 @@ config EBONY
        help
          This option enables support for the IBM PPC440GP evaluation board.
 
+config SEQUOIA
+       bool "Sequoia"
+       depends on 44x
+       default n
+       select 440EPX
+       help
+         This option enables support for the AMCC PPC440EPX evaluation board.
+
 #config LUAN
 #      bool "Luan"
 #      depends on 44x
@@ -35,6 +43,14 @@ config 440EP
        bool
        select PPC_FPU
        select IBM440EP_ERR42
+#      select IBM_NEW_EMAC_ZMII
+
+config 440EPX
+       bool
+       select PPC_FPU
+# Disabled until the new EMAC Driver is merged.
+#      select IBM_NEW_EMAC_EMAC4
+#      select IBM_NEW_EMAC_ZMII
 
 config 440GP
        bool
@@ -48,7 +64,7 @@ config 440SP
 
 config 440A
        bool
-       depends on 440GX
+       depends on 440GX || 440EPX
        default y
 
 # 44x errata/workaround config symbols, selected by the CPU models above