Merge branch 'topic/core-cleanup' into for-linus

[safe/jmp/linux-2.6] / arch / powerpc / platforms / 85xx / Kconfig

diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
index 74779b9..3a2ade2 100644 (file)
--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@ -1,7 +1,15 @@
-choice
-       prompt "Machine Type"
-       depends on PPC_85xx
-       default MPC8540_ADS
+menuconfig FSL_SOC_BOOKE
+       bool "Freescale Book-E Machine Type"
+       depends on PPC_85xx || PPC_BOOK3E
+       select FSL_SOC
+       select PPC_UDBG_16550
+       select MPIC
+       select PPC_PCI_CHOICE
+       select FSL_PCI if PCI
+       select SERIAL_8250_SHARE_IRQ if SERIAL_8250
+       default y
+
+if FSL_SOC_BOOKE
 
 config MPC8540_ADS
        bool "Freescale MPC8540 ADS"
@@ -12,7 +20,6 @@ config MPC8540_ADS
 config MPC8560_ADS
        bool "Freescale MPC8560 ADS"
        select DEFAULT_UIMAGE
-       select PPC_CPM_NEW_BINDING
        select CPM2
        help
          This option enables support for the MPC 8560 ADS board
@@ -27,18 +34,59 @@ config MPC85xx_CDS
 config MPC85xx_MDS
        bool "Freescale MPC85xx MDS"
        select DEFAULT_UIMAGE
-       select QUICC_ENGINE
+       select PHYLIB
+       select HAS_RAPIDIO
+       select SWIOTLB
        help
          This option enables support for the MPC85xx MDS board
 
+config MPC8536_DS
+       bool "Freescale MPC8536 DS"
+       select DEFAULT_UIMAGE
+       select SWIOTLB
+       help
+         This option enables support for the MPC8536 DS board
+
 config MPC85xx_DS
        bool "Freescale MPC85xx DS"
        select PPC_I8259
        select DEFAULT_UIMAGE
-       select FSL_ULI1575
+       select FSL_ULI1575 if PCI
+       select SWIOTLB
        help
          This option enables support for the MPC85xx DS (MPC8544 DS) board
 
+config MPC85xx_RDB
+       bool "Freescale MPC85xx RDB"
+       select PPC_I8259
+       select DEFAULT_UIMAGE
+       select FSL_ULI1575 if PCI
+       select SWIOTLB
+       help
+         This option enables support for the MPC85xx RDB (P2020 RDB) board
+
+config SOCRATES
+       bool "Socrates"
+       select DEFAULT_UIMAGE
+       help
+         This option enables support for the Socrates board.
+
+config KSI8560
+        bool "Emerson KSI8560"
+        select DEFAULT_UIMAGE
+        help
+          This option enables support for the Emerson KSI8560 board
+
+config XES_MPC85xx
+       bool "X-ES single-board computer"
+       select DEFAULT_UIMAGE
+       help
+         This option enables support for the various single-board
+         computers from Extreme Engineering Solutions (X-ES) based on
+         Freescale MPC85xx processors.
+         Manufacturer: Extreme Engineering Solutions, Inc.
+         URL: <http://www.xes-inc.com/>
+
 config STX_GP3
        bool "Silicon Turnkey Express GP3"
        help
@@ -46,14 +94,12 @@ config STX_GP3
          board.
        select CPM2
        select DEFAULT_UIMAGE
-       select PPC_CPM_NEW_BINDING
 
 config TQM8540
        bool "TQ Components TQM8540"
        help
          This option enables support for the TQ Components TQM8540 board.
        select DEFAULT_UIMAGE
-       select PPC_CPM_NEW_BINDING
        select TQM85xx
 
 config TQM8541
@@ -61,16 +107,21 @@ config TQM8541
        help
          This option enables support for the TQ Components TQM8541 board.
        select DEFAULT_UIMAGE
-       select PPC_CPM_NEW_BINDING
        select TQM85xx
        select CPM2
 
+config TQM8548
+       bool "TQ Components TQM8548"
+       help
+         This option enables support for the TQ Components TQM8548 board.
+       select DEFAULT_UIMAGE
+       select TQM85xx
+
 config TQM8555
        bool "TQ Components TQM8555"
        help
          This option enables support for the TQ Components TQM8555 board.
        select DEFAULT_UIMAGE
-       select PPC_CPM_NEW_BINDING
        select TQM85xx
        select CPM2
 
@@ -79,7 +130,6 @@ config TQM8560
        help
          This option enables support for the TQ Components TQM8560 board.
        select DEFAULT_UIMAGE
-       select PPC_CPM_NEW_BINDING
        select TQM85xx
        select CPM2
 
@@ -92,28 +142,22 @@ config SBC8548
 config SBC8560
        bool "Wind River SBC8560"
        select DEFAULT_UIMAGE
-       select PPC_CPM_NEW_BINDING if CPM2
        help
          This option enables support for the Wind River SBC8560 board
 
-endchoice
-
-config TQM85xx
-       bool
-       select MPC85xx
+config P4080_DS
+       bool "Freescale P4080 DS"
+       select DEFAULT_UIMAGE
+       select PPC_FSL_BOOK3E
+       select PPC_E500MC
+       select PHYS_64BIT
+       select SWIOTLB
+       select MPC8xxx_GPIO
+       select HAS_RAPIDIO
+       help
+         This option enables support for the P4080 DS board
 
-config MPC8540
-       bool
-       select PPC_UDBG_16550
-       select PPC_INDIRECT_PCI
-       default y if MPC8540_ADS || MPC85xx_CDS || SBC8548
+endif # FSL_SOC_BOOKE
 
-config MPC85xx
+config TQM85xx
        bool
-       select PPC_UDBG_16550
-       select PPC_INDIRECT_PCI if PCI
-       select MPIC
-       select FSL_PCI if PCI
-       select SERIAL_8250_SHARE_IRQ if SERIAL_8250
-       default y if MPC8540_ADS || MPC85xx_CDS || MPC8560_ADS \
-               || MPC85xx_MDS || MPC85xx_DS || STX_GP3 || SBC8560 || SBC8548