Merge branch 'for-2.6.27' of git://linux-nfs.org/~bfields/linux

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

diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig
index bee49ca..249ba01 100644 (file)
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@ -111,6 +111,22 @@ config YOSEMITE
 #      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.
+
 # 44x specific CPU modules, selected based on the board above.
 config 440EP
        bool
@@ -161,3 +177,13 @@ config 460EX
 # 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
+