powerpc/85xx: Add support for the "socrates" board (MPC8544).

[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 28bc6e5..7f066ad 100644 (file)
--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@ -2,8 +2,8 @@ menuconfig MPC85xx
        bool "Machine Type"
        depends on PPC_85xx
        select PPC_UDBG_16550
-       select PPC_INDIRECT_PCI if PCI
        select MPIC
+       select PPC_PCI_CHOICE
        select FSL_PCI if PCI
        select SERIAL_8250_SHARE_IRQ if SERIAL_8250
        default y
@@ -19,7 +19,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
@@ -34,10 +33,16 @@ config MPC85xx_CDS
 config MPC85xx_MDS
        bool "Freescale MPC85xx MDS"
        select DEFAULT_UIMAGE
-       select QUICC_ENGINE
+       select PHYLIB
        help
          This option enables support for the MPC85xx MDS board
 
+config MPC8536_DS
+       bool "Freescale MPC8536 DS"
+       select DEFAULT_UIMAGE
+       help
+         This option enables support for the MPC8536 DS board
+
 config MPC85xx_DS
        bool "Freescale MPC85xx DS"
        select PPC_I8259
@@ -46,9 +51,14 @@ config MPC85xx_DS
        help
          This option enables support for the MPC85xx DS (MPC8544 DS) board
 
+config SOCRATES
+       bool "Socrates"
+       select DEFAULT_UIMAGE
+       help
+         This option enables support for the Socrates board.
+
 config KSI8560
         bool "Emerson KSI8560"
-        select PPC_CPM_NEW_BINDING
         select DEFAULT_UIMAGE
         help
           This option enables support for the Emerson KSI8560 board
@@ -60,14 +70,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
@@ -75,16 +83,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
 
@@ -93,7 +106,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
 
@@ -106,7 +118,6 @@ 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