Pull sbs into release branch

[linux-2.6] / arch / powerpc / platforms / Kconfig

diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index 86be82a4b9ef09af3f8c36caa8936d638baace5d..932538a93c2bb63c9b31ed677cddd5c4364a97e6 100644 (file)
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -2,7 +2,7 @@ menu "Platform support"
 
 choice
        prompt "Machine type"
-       depends on PPC64 || CLASSIC32
+       depends on PPC64 || 6xx
        default PPC_MULTIPLATFORM
 
 config PPC_MULTIPLATFORM
@@ -16,15 +16,30 @@ config EMBEDDED6xx
        bool "Embedded 6xx/7xx/7xxx-based board"
        depends on PPC32 && (BROKEN||BROKEN_ON_SMP)
 
-config APUS
-       bool "Amiga-APUS"
-       depends on PPC32 && BROKEN
+config PPC_82xx
+       bool "Freescale 82xx"
+       depends on 6xx
+
+config PPC_83xx
+       bool "Freescale 83xx"
+       depends on 6xx
+       select FSL_SOC
+       select 83xx
+       select WANT_DEVICE_TREE
+
+config PPC_86xx
+       bool "Freescale 86xx"
+       depends on 6xx
+       select FSL_SOC
+       select ALTIVEC
        help
-         Select APUS if configuring for a PowerUP Amiga.
-         More information is available at:
-         <http://linux-apus.sourceforge.net/>.
+         The Freescale E600 SoCs have 74xx cores.
 endchoice
 
+config CLASSIC32
+       def_bool y
+       depends on 6xx && PPC_MULTIPLATFORM
+
 source "arch/powerpc/platforms/pseries/Kconfig"
 source "arch/powerpc/platforms/iseries/Kconfig"
 source "arch/powerpc/platforms/chrp/Kconfig"
@@ -42,6 +57,7 @@ source "arch/powerpc/platforms/83xx/Kconfig"
 source "arch/powerpc/platforms/85xx/Kconfig"
 source "arch/powerpc/platforms/86xx/Kconfig"
 source "arch/powerpc/platforms/embedded6xx/Kconfig"
+source "arch/powerpc/platforms/44x/Kconfig"
 #source "arch/powerpc/platforms/4xx/Kconfig
 
 config PPC_NATIVE
@@ -115,7 +131,7 @@ config MMIO_NVRAM
        bool
        default n
 
-config MPIC_BROKEN_U3
+config MPIC_U3_HT_IRQS
        bool
        depends on PPC_MAPLE
        default y
@@ -148,14 +164,14 @@ config GENERIC_IOMAP
        bool
        default n
 
-menu "CPU Frequency support"
-       depends on PPC64 || CLASSIC32
-
 source "drivers/cpufreq/Kconfig"
 
+menu "CPU Frequency drivers"
+       depends on CPU_FREQ
+
 config CPU_FREQ_PMAC
        bool "Support for Apple PowerBooks"
-       depends on CPU_FREQ && ADB_PMU && PPC32
+       depends on ADB_PMU && PPC32
        select CPU_FREQ_TABLE
        help
          This adds support for frequency switching on Apple PowerBooks,
@@ -164,11 +180,21 @@ config CPU_FREQ_PMAC
 
 config CPU_FREQ_PMAC64
        bool "Support for some Apple G5s"
-       depends on CPU_FREQ && PPC64
+       depends on PPC_PMAC && PPC64
        select CPU_FREQ_TABLE
        help
          This adds support for frequency switching on Apple iMac G5,
          and some of the more recent desktop G5 machines as well.
+
+config PPC_PASEMI_CPUFREQ
+       bool "Support for PA Semi PWRficient"
+       depends on PPC_PASEMI
+       default y
+       select CPU_FREQ_TABLE
+       help
+         This adds the support for frequency switching on PA Semi
+         PWRficient processors.
+
 endmenu
 
 config PPC601_SYNC_FIX
@@ -246,4 +272,14 @@ config CPM2
          you wish to build a kernel for a machine with a CPM2 coprocessor
          on it (826x, 827x, 8560).
 
+config AXON_RAM
+       tristate "Axon DDR2 memory device driver"
+       depends on PPC_IBM_CELL_BLADE
+       default m
+       help
+         It registers one block device per Axon's DDR2 memory bank found
+         on a system. Block devices are called axonram?, their major and
+         minor numbers are available in /proc/devices, /proc/partitions or
+         in /sys/block/axonram?/dev.
+
 endmenu