Merge branch 'linus' into core/urgent

[linux-2.6-omap-h63xx.git] / arch / powerpc / platforms / 44x / Kconfig

diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig
index 1bfb2191010a57dc87277d5d5d376f403bcd1f5c..79c1154f88d42464796c3dd0d5ce8194a8c7862c 100644 (file)
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@ -2,6 +2,7 @@ config BAMBOO
        bool "Bamboo"
        depends on 44x
        default n
+       select PPC44x_SIMPLE
        select 440EP
        select PCI
        help
@@ -17,10 +18,20 @@ config EBONY
        help
          This option enables support for the IBM PPC440GP evaluation board.
 
+config SAM440EP
+        bool "Sam440ep"
+       depends on 44x
+        default n
+        select 440EP
+        select PCI
+        help
+          This option enables support for the ACube Sam440ep board.
+
 config SEQUOIA
        bool "Sequoia"
        depends on 44x
        default n
+       select PPC44x_SIMPLE
        select 440EPX
        help
          This option enables support for the AMCC PPC440EPX evaluation board.
@@ -29,6 +40,7 @@ config TAISHAN
        bool "Taishan"
        depends on 44x
        default n
+       select PPC44x_SIMPLE
        select 440GX
        select PCI
        help
@@ -39,6 +51,7 @@ config KATMAI
        bool "Katmai"
        depends on 44x
        default n
+       select PPC44x_SIMPLE
        select 440SPe
        select PCI
        select PPC4xx_PCI_EXPRESS
@@ -49,6 +62,7 @@ config RAINIER
        bool "Rainier"
        depends on 44x
        default n
+       select PPC44x_SIMPLE
        select 440GRX
        select PCI
        help
@@ -67,6 +81,53 @@ config WARP
          See http://www.pikatechnologies.com/ and follow the "PIKA for Computer
          Telephony Developers" link for more information.
 
+config ARCHES
+       bool "Arches"
+       depends on 44x
+       default n
+       select PPC44x_SIMPLE
+       select 460EX # Odd since it uses 460GT but the effects are the same
+       select PCI
+       select PPC4xx_PCI_EXPRESS
+       help
+         This option enables support for the AMCC Dual PPC460GT evaluation board.
+
+config CANYONLANDS
+       bool "Canyonlands"
+       depends on 44x
+       default n
+       select PPC44x_SIMPLE
+       select 460EX
+       select PCI
+       select PPC4xx_PCI_EXPRESS
+       select IBM_NEW_EMAC_RGMII
+       select IBM_NEW_EMAC_ZMII
+       help
+         This option enables support for the AMCC PPC460EX evaluation board.
+
+config GLACIER
+       bool "Glacier"
+       depends on 44x
+       default n
+       select PPC44x_SIMPLE
+       select 460EX # Odd since it uses 460GT but the effects are the same
+       select PCI
+       select PPC4xx_PCI_EXPRESS
+       select IBM_NEW_EMAC_RGMII
+       select IBM_NEW_EMAC_ZMII
+       help
+         This option enables support for the AMCC PPC460GT evaluation board.
+
+config YOSEMITE
+       bool "Yosemite"
+       depends on 44x
+       default n
+       select PPC44x_SIMPLE
+       select 440EP
+       select PCI
+       help
+         This option enables support for the AMCC PPC440EP evaluation board.
+
 #config LUAN
 #      bool "Luan"
 #      depends on 44x
@@ -83,6 +144,29 @@ config WARP
 #      help
 #        This option enables support for the IBM PPC440GX evaluation board.
 
+config XILINX_VIRTEX440_GENERIC_BOARD
+       bool "Generic Xilinx Virtex 440 board"
+       depends on 44x
+       default n
+       select XILINX_VIRTEX_5_FXT
+       help
+         This option enables generic support for Xilinx Virtex based boards
+         that use a 440 based processor in the Virtex 5 FXT FPGA architecture.
+
+         The generic virtex board support matches any device tree which
+         specifies 'xlnx,virtex440' in its compatible field.  This includes
+         the Xilinx ML5xx reference designs using the powerpc core.
+
+         Most Virtex 5 designs should use this unless it needs to do some
+         special configuration at board probe time.
+
+config PPC44x_SIMPLE
+       bool "Simple PowerPC 44x board support"
+       depends on 44x
+       default n
+       help
+         This option enables the simple PowerPC 44x platform support.
+
 # 44x specific CPU modules, selected based on the board above.
 config 440EP
        bool
@@ -122,6 +206,22 @@ config 440SPe
        bool
        select IBM_NEW_EMAC_EMAC4
 
+config 460EX
+       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
+
+# Xilinx specific config options.
+config XILINX_VIRTEX
+       bool
+
+# Xilinx Virtex 5 FXT FPGA architecture, selected by a Xilinx board above
+config XILINX_VIRTEX_5_FXT
+       bool
+       select XILINX_VIRTEX
+