Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

[linux-2.6] / arch / powerpc / platforms / 83xx / Kconfig

diff --git a/arch/powerpc/platforms/83xx/Kconfig b/arch/powerpc/platforms/83xx/Kconfig
index 7675e67..7edb6b4 100644 (file)
--- a/arch/powerpc/platforms/83xx/Kconfig
+++ b/arch/powerpc/platforms/83xx/Kconfig
@@ -5,6 +5,13 @@ choice
        prompt "Machine Type"
        default MPC834x_SYS
 
+config MPC832x_MDS
+       bool "Freescale MPC832x MDS"
+       select DEFAULT_UIMAGE
+       select QUICC_ENGINE
+       help
+         This option enables support for the MPC832x MDS evaluation board.
+
 config MPC834x_SYS
        bool "Freescale MPC834x SYS"
        select DEFAULT_UIMAGE
@@ -16,12 +23,40 @@ config MPC834x_SYS
          3 PCI slots.  The PIBs PCI initialization is the bootloader's
          responsiblilty.
 
+config MPC834x_ITX
+       bool "Freescale MPC834x ITX"
+       select DEFAULT_UIMAGE
+       help
+         This option enables support for the MPC 834x ITX evaluation board.
+
+         Be aware that PCI initialization is the bootloader's
+         responsiblilty.
+
+config MPC8360E_PB
+       bool "Freescale MPC8360E PB"
+       select DEFAULT_UIMAGE
+       select QUICC_ENGINE
+       help
+         This option enables support for the MPC836x EMDS Processor Board.
+
 endchoice
 
+config PPC_MPC832x
+       bool
+       select PPC_UDBG_16550
+       select PPC_INDIRECT_PCI
+       default y if MPC832x_MDS
+
 config MPC834x
        bool
        select PPC_UDBG_16550
        select PPC_INDIRECT_PCI
-       default y if MPC834x_SYS
+       default y if MPC834x_SYS || MPC834x_ITX
+
+config PPC_MPC836x
+       bool
+       select PPC_UDBG_16550
+       select PPC_INDIRECT_PCI
+       default y if MPC8360E_PB
 
 endmenu