Merge branches 'release', 'asus', 'sony-laptop' and 'thinkpad' into release

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

diff --git a/arch/powerpc/platforms/82xx/Kconfig b/arch/powerpc/platforms/82xx/Kconfig
index de7fce9..4fad6c7 100644 (file)
--- a/arch/powerpc/platforms/82xx/Kconfig
+++ b/arch/powerpc/platforms/82xx/Kconfig
@@ -1,17 +1,43 @@
 choice
-       prompt "Machine Type"
+       prompt "82xx Board Type"
        depends on PPC_82xx
-       default MPC82xx_ADS
+       default MPC8272_ADS
 
-config MPC82xx_ADS
-       bool "Freescale MPC82xx 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
+         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
+
+config EP8248E
+       bool "Embedded Planet EP8248E (a.k.a. CWH-PPC-8248N-VE)"
+       select 8272
+       select 8260
+       select FSL_SOC
+       select PPC_CPM_NEW_BINDING
+       select MDIO_BITBANG
+       help
+         This enables support for the Embedded Planet EP8248E board.
+
+         This board is also resold by Freescale as the QUICCStart
+         MPC8248 Evaluation System and/or the CWH-PPC-8248N-VE.
 
 endchoice
 
@@ -34,3 +60,6 @@ config 8272
        help
          The MPC8272 CPM has a different internal dpram setup than other CPM2
          devices
+
+config PQ2_ADS_PCI_PIC
+       bool