Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

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

diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index 229d355ed86a7264548e1dcb0b4145a3e0349c6a..fcedbec07f94fe7478f50f19833afe3b9c87a20e 100644 (file)
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -21,8 +21,10 @@ config PPC_83xx
        bool "Freescale 83xx"
        depends on 6xx
        select FSL_SOC
-       select 83xx
+       select MPC83xx
+       select IPIC
        select WANT_DEVICE_TREE
+       select FSL_EMB_PERFMON
 
 config PPC_86xx
        bool "Freescale 86xx"
@@ -40,6 +42,7 @@ config CLASSIC32
 source "arch/powerpc/platforms/pseries/Kconfig"
 source "arch/powerpc/platforms/iseries/Kconfig"
 source "arch/powerpc/platforms/chrp/Kconfig"
+source "arch/powerpc/platforms/512x/Kconfig"
 source "arch/powerpc/platforms/52xx/Kconfig"
 source "arch/powerpc/platforms/powermac/Kconfig"
 source "arch/powerpc/platforms/prep/Kconfig"
@@ -80,6 +83,10 @@ config XICS
        bool
        default y
 
+config IPIC
+       bool
+       default n
+
 config MPIC
        bool
        default n
@@ -120,7 +127,7 @@ config PPC_PMI
        depends on PPC_IBM_CELL_BLADE
        help
          PMI (Platform Management Interrupt) is a way to
-         communicate with the BMC (Baseboard Mangement Controller).
+         communicate with the BMC (Baseboard Management Controller).
          It is used in some IBM Cell blades.
        default m
 
@@ -265,6 +272,7 @@ config TAU_AVERAGE
 config QUICC_ENGINE
        bool
        select PPC_LIB_RHEAP
+       select CRC32
        help
          The QUICC Engine (QE) is a new generation of communications
          coprocessors on Freescale embedded CPUs (akin to CPM in older chips).
@@ -272,8 +280,8 @@ config QUICC_ENGINE
          for a machine with a QE coprocessor.
 
 config CPM2
-       bool
-       default n
+       bool "Enable support for the CPM2 (Communications Processor Module)"
+       depends on MPC85xx || 8260
        select CPM
        select PPC_LIB_RHEAP
        help
@@ -315,6 +323,12 @@ config FSL_ULI1575
 config CPM
        bool
 
+config OF_RTC
+       bool
+       help
+         Uses information from the OF or flattened device tree to instatiate
+         platform devices for direct mapped RTC chips like the DS1742 or DS1743.
+
 source "arch/powerpc/sysdev/bestcomm/Kconfig"
 
 endmenu