Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[pandora-kernel.git] / arch / powerpc / platforms / 83xx / Kconfig

diff --git a/arch/powerpc/platforms/83xx/Kconfig b/arch/powerpc/platforms/83xx/Kconfig
index 2430ac8..6159c5d 100644 (file)
--- a/arch/powerpc/platforms/83xx/Kconfig
+++ b/arch/powerpc/platforms/83xx/Kconfig
@@ -1,18 +1,26 @@
-choice
-       prompt "83xx Board Type"
-       depends on PPC_83xx
-       default MPC834x_MDS
+menuconfig PPC_83xx
+       bool "83xx-based boards"
+       depends on 6xx && PPC_MULTIPLATFORM
+       select PPC_UDBG_16550
+       select PPC_PCI_CHOICE
+       select FSL_PCI if PCI
+       select FSL_SOC
+       select IPIC
+
+if PPC_83xx
 
-config MPC8313_RDB
-       bool "Freescale MPC8313 RDB"
+config MPC831x_RDB
+       bool "Freescale MPC831x RDB"
        select DEFAULT_UIMAGE
+       select PPC_MPC831x
        help
-         This option enables support for the MPC8313 RDB board.
+         This option enables support for the MPC8313 RDB and MPC8315 RDB boards.
 
 config MPC832x_MDS
        bool "Freescale MPC832x MDS"
        select DEFAULT_UIMAGE
        select QUICC_ENGINE
+       select PPC_MPC832x
        help
          This option enables support for the MPC832x MDS evaluation board.
 
@@ -20,12 +28,14 @@ config MPC832x_RDB
        bool "Freescale MPC832x RDB"
        select DEFAULT_UIMAGE
        select QUICC_ENGINE
+       select PPC_MPC832x
        help
          This option enables support for the MPC8323 RDB board.
 
 config MPC834x_MDS
        bool "Freescale MPC834x MDS"
        select DEFAULT_UIMAGE
+       select PPC_MPC834x
        help
          This option enables support for the MPC 834x MDS evaluation board.
 
@@ -37,6 +47,7 @@ config MPC834x_MDS
 config MPC834x_ITX
        bool "Freescale MPC834x ITX"
        select DEFAULT_UIMAGE
+       select PPC_MPC834x
        help
          This option enables support for the MPC 834x ITX evaluation board.
 
@@ -50,39 +61,61 @@ config MPC836x_MDS
        help
          This option enables support for the MPC836x MDS Processor Board.
 
+config MPC836x_RDK
+       bool "Freescale/Logic MPC836x RDK"
+       select DEFAULT_UIMAGE
+       select QUICC_ENGINE
+       select QE_GPIO
+       select FSL_GTM
+       select FSL_LBC
+       help
+         This option enables support for the MPC836x RDK Processor Board,
+         also known as ZOOM PowerQUICC Kit.
+
 config MPC837x_MDS
        bool "Freescale MPC837x MDS"
        select DEFAULT_UIMAGE
+       select PPC_MPC837x
        help
          This option enables support for the MPC837x MDS Processor Board.
-endchoice
 
+config MPC837x_RDB
+       bool "Freescale MPC837x RDB"
+       select DEFAULT_UIMAGE
+       select PPC_MPC837x
+       help
+         This option enables support for the MPC837x RDB Board.
+
+config SBC834x
+       bool "Wind River SBC834x"
+       select DEFAULT_UIMAGE
+       select PPC_MPC834x
+       help
+         This option enables support for the Wind River SBC834x board.
+
+config ASP834x
+       bool "Analogue & Micro ASP 834x"
+       select PPC_MPC834x
+       select REDBOOT
+       help
+         This enables support for the Analogue & Micro ASP 83xx
+         board.
+
+
+endif
+
+# used for usb
 config PPC_MPC831x
        bool
-       select PPC_UDBG_16550
-       select PPC_INDIRECT_PCI
-       default y if MPC8313_RDB
 
+# used for math-emu
 config PPC_MPC832x
        bool
-       select PPC_UDBG_16550
-       select PPC_INDIRECT_PCI
-       default y if MPC832x_MDS || MPC832x_RDB
 
-config MPC834x
+# used for usb
+config PPC_MPC834x
        bool
-       select PPC_UDBG_16550
-       select PPC_INDIRECT_PCI
-       default y if MPC834x_MDS || MPC834x_ITX
-
-config PPC_MPC836x
-       bool
-       select PPC_UDBG_16550
-       select PPC_INDIRECT_PCI
-       default y if MPC836x_MDS
 
+# used for usb
 config PPC_MPC837x
        bool
-       select PPC_UDBG_16550
-       select PPC_INDIRECT_PCI
-       default y if MPC837x_MDS