Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh64-2.6

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

diff --git a/arch/powerpc/platforms/82xx/Kconfig b/arch/powerpc/platforms/82xx/Kconfig
index 47d841e..541fbb8 100644 (file)
--- a/arch/powerpc/platforms/82xx/Kconfig
+++ b/arch/powerpc/platforms/82xx/Kconfig
@@ -1,21 +1,52 @@
-menu "Platform support"
-       depends on PPC_82xx
-
 choice
-       prompt "Machine Type"
-       default MPC82xx_ADS
+       prompt "82xx Board Type"
+       depends on PPC_82xx
+       default MPC8272_ADS
+
+config MPC8272_ADS
+       bool "Freescale MPC8272 ADS"
+       select DEFAULT_UIMAGE
+       select PQ2ADS
+       select 8272
+       select 8260
+       select FSL_SOC
+       select PQ2_ADS_PCI_PIC if PCI
+       select PPC_CPM_NEW_BINDING
+       help
+         This option enables support for the MPC8272 ADS board
 
-config MPC82xx_ADS
-       bool "Freescale MPC82xx ADS"
-       select DEFAULT_UIMAGE
-       select PQ2ADS
-       select 8272
-       select 8260
-       select CPM2
-       select FSL_SOC
-       help
-         This option enables support for the MPC8272 ADS board
+config PQ2FADS
+       bool "Freescale PQ2FADS"
+       select DEFAULT_UIMAGE
+       select PQ2ADS
+       select 8260
+       select FSL_SOC
+       select PQ2_ADS_PCI_PIC if PCI
+       select PPC_CPM_NEW_BINDING
+       help
+         This option enables support for the PQ2FADS board
 
 endchoice
 
-endmenu
+config PQ2ADS
+       bool
+       default n
+
+config 8260
+       bool
+       depends on 6xx
+       select CPM2
+       help
+         The MPC8260 is a typical embedded CPU made by Freescale.  Selecting
+         this option means that you wish to build a kernel for a machine with
+         an 8260 class CPU.
+
+config 8272
+       bool
+       select 8260
+       help
+         The MPC8272 CPM has a different internal dpram setup than other CPM2
+         devices
+
+config PQ2_ADS_PCI_PIC
+       bool