[POWERPC] 85xx: rework platform Kconfig

[linux-2.6-omap-h63xx.git] / arch / powerpc / platforms / 85xx / Kconfig

diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
index 99bb74da07600e6a417863cb9092e11253a6041e..7e76ddbd5821f6e88bdd5b4748bf60c28b86a760 100644 (file)
--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@ -1,7 +1,14 @@
-choice
-       prompt "Machine Type"
+menuconfig MPC85xx
+       bool "Machine Type"
        depends on PPC_85xx
-       default MPC8540_ADS
+       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 MPC85xx
 
 config MPC8540_ADS
        bool "Freescale MPC8540 ADS"
@@ -12,48 +19,91 @@ 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
 
 config MPC85xx_CDS
        bool "Freescale MPC85xx CDS"
        select DEFAULT_UIMAGE
+       select PPC_I8259
        help
          This option enables support for the MPC85xx CDS board
 
 config MPC85xx_MDS
        bool "Freescale MPC85xx MDS"
        select DEFAULT_UIMAGE
-#      select QUICC_ENGINE
+       select QUICC_ENGINE
        help
          This option enables support for the MPC85xx MDS board
 
-config MPC8544_DS
-       bool "Freescale MPC8544 DS"
+config MPC85xx_DS
+       bool "Freescale MPC85xx DS"
        select PPC_I8259
        select DEFAULT_UIMAGE
+       select FSL_ULI1575
        help
-         This option enables support for the MPC8544 DS board
+         This option enables support for the MPC85xx DS (MPC8544 DS) board
 
-endchoice
+config STX_GP3
+       bool "Silicon Turnkey Express GP3"
+       help
+         This option enables support for the Silicon Turnkey Express GP3
+         board.
+       select CPM2
+       select DEFAULT_UIMAGE
+       select PPC_CPM_NEW_BINDING
 
-config MPC8540
-       bool
-       select PPC_UDBG_16550
-       select PPC_INDIRECT_PCI
-       default y if MPC8540_ADS || MPC85xx_CDS
+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 MPC8560
-       bool
+config TQM8541
+       bool "TQ Components 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 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
+
+config TQM8560
+       bool "TQ Components TQM8560"
+       help
+         This option enables support for the TQ Components TQM8560 board.
+       select DEFAULT_UIMAGE
+       select PPC_CPM_NEW_BINDING
+       select TQM85xx
        select CPM2
-       default y if MPC8560_ADS
 
-config MPC85xx
+config SBC8548
+       bool "Wind River SBC8548"
+       select DEFAULT_UIMAGE
+       help
+         This option enables support for the Wind River SBC8548 board
+
+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
+
+endif # 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 || MPC8544_DS