Merge commit 'origin/master'

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

diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
index ecbe580..291675b 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
@@ -38,6 +38,12 @@ config MPC85xx_MDS
        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
@@ -75,6 +81,13 @@ config TQM8541
        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