Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...

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

diff --git a/arch/powerpc/platforms/86xx/Kconfig b/arch/powerpc/platforms/86xx/Kconfig
index 21d1135..80a81e0 100644 (file)
--- a/arch/powerpc/platforms/86xx/Kconfig
+++ b/arch/powerpc/platforms/86xx/Kconfig
@@ -1,30 +1,43 @@
-choice
-       prompt "86xx Board Type"
-       depends on PPC_86xx
-       default MPC8641_HPCN
+config PPC_86xx
+menuconfig PPC_86xx
+       bool "86xx-based boards"
+       depends on 6xx && PPC_MULTIPLATFORM
+       select FSL_SOC
+       select ALTIVEC
+       help
+         The Freescale E600 SoCs have 74xx cores.
+
+if PPC_86xx
 
 config MPC8641_HPCN
        bool "Freescale MPC8641 HPCN"
        select PPC_I8259
        select DEFAULT_UIMAGE
        select FSL_ULI1575
+       select HAS_RAPIDIO
        help
          This option enables support for the MPC8641 HPCN board.
 
+config SBC8641D
+       bool "Wind River SBC8641D"
+       select DEFAULT_UIMAGE
+       help
+         This option enables support for the WRS SBC8641D board.
+
 config MPC8610_HPCD
        bool "Freescale MPC8610 HPCD"
        select DEFAULT_UIMAGE
        help
          This option enables support for the MPC8610 HPCD board.
 
-endchoice
+endif
 
 config MPC8641
        bool
        select FSL_PCI if PCI
        select PPC_UDBG_16550
        select MPIC
-       default y if MPC8641_HPCN
+       default y if MPC8641_HPCN || SBC8641D
 
 config MPC8610
        bool