Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

[pandora-kernel.git] / arch / powerpc / platforms / 44x / Kconfig

diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig
index eeba0a7..0f979c5 100644 (file)
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@ -17,6 +17,16 @@ config BAMBOO
        help
          This option enables support for the IBM PPC440EP evaluation board.
 
+config BLUESTONE
+       bool "Bluestone"
+       depends on 44x
+       default n
+       select PPC44x_SIMPLE
+       select APM821xx
+       select IBM_NEW_EMAC_RGMII
+       help
+         This option enables support for the APM APM821xx Evaluation board.
+
 config EBONY
        bool "Ebony"
        depends on 44x
@@ -171,6 +181,17 @@ config ISS4xx
        help
          This option enables support for the IBM ISS simulation environment
 
+config ICON
+       bool "Icon"
+       depends on 44x
+       default n
+       select PPC44x_SIMPLE
+       select 440SPe
+       select PCI
+       select PPC4xx_PCI_EXPRESS
+       help
+         This option enables support for the AMCC PPC440SPe evaluation board.
+
 #config LUAN
 #      bool "Luan"
 #      depends on 44x
@@ -282,6 +303,12 @@ config 460SX
        select IBM_NEW_EMAC_ZMII
        select IBM_NEW_EMAC_TAH
 
+config APM821xx
+       bool
+       select PPC_FPU
+       select IBM_NEW_EMAC_EMAC4
+       select IBM_NEW_EMAC_TAH
+
 # 44x errata/workaround config symbols, selected by the CPU models above
 config IBM440EP_ERR42
        bool