This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / ppc / Kconfig

diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index 051832b..da5c9e5 100644 (file)
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -44,18 +44,18 @@ choice
        default 6xx
 
 config 6xx
-       bool "6xx/7xx/74xx/52xx/8260"
+       bool "6xx/7xx/74xx/8260"
        help
          There are four types of PowerPC chips supported.  The more common
          types (601, 603, 604, 740, 750, 7400), the Motorola embedded
-         versions (821, 823, 850, 855, 860, 52xx, 8260), the IBM embedded
-         versions (403 and 405) and the high end 64 bit Power processors 
-         (POWER 3, POWER4, and IBM 970 also known as G5)
+         versions (821, 823, 850, 855, 860, 8260), the IBM embedded versions
+         (403 and 405) and the high end 64 bit Power processors (POWER 3,
+         POWER4, and IBM 970 also known as G5)
          Unless you are building a kernel for one of the embedded processor
          systems, 64 bit IBM RS/6000 or an Apple G5, choose 6xx.
          Note that the kernel runs in 32-bit mode even on 64-bit chips.
-         Also note that because the 52xx & 82xx family has a 603e core,
-         specific support for that chipset is asked later on.
+         Also note that because the 82xx family has a 603e core, specific
+         support for that chipset is asked later on.
 
 config 40x
        bool "40x"
@@ -191,7 +191,7 @@ config CPU_FREQ
          fly. This is a nice method to save battery power on notebooks,
          because the lower the clock speed, the less power the CPU consumes.
 
-         For more information, take a look at <file:Documentation/cpu-freq> or
+         For more information, take a look at linux/Documentation/cpu-freq or
          at <http://www.brodo.de/cpufreq/>
 
          If in doubt, say N.
@@ -583,7 +583,7 @@ config SBC82xx
 config SBS8260
        bool "SBS8260"
 
-config RPX8260
+config RPX6
        bool "RPXSUPER"
 
 config TQM8260
@@ -601,15 +601,6 @@ config TQM8260
 config ADS8272
        bool "ADS8272"
 
-config LITE5200
-       bool "Freescale LITE5200 / (IceCube)"
-       select PPC_MPC52xx
-       help
-         Support for the LITE5200 dev board for the MPC5200 from Freescale.
-         This is for the LITE5200 version 2.0 board. Don't know if it changes
-         much but it's only been tested on this board version. I think this
-         board is also known as IceCube.
-
 endchoice
 
 config PQ2ADS
@@ -626,14 +617,11 @@ config EMBEDDEDBOOT
        bool
        depends on 8xx || 8260
        default y
-       
-config PPC_MPC52xx
-       bool
 
 config 8260
        bool "CPM2 Support" if WILLOW
        depends on 6xx
-       default y if TQM8260 || RPX8260 || EST8260 || SBS8260 || SBC82xx
+       default y if TQM8260 || RPXSUPER || EST8260 || SBS8260 || SBC82xx
        help
          The MPC8260 is a typical embedded CPU made by Motorola.  Selecting
          this option means that you wish to build a kernel for a machine with
@@ -650,7 +638,7 @@ config 8272
 
 config CPM2
        bool
-       depends on 8260 || MPC8560
+       depends on 8260
        default y
        help
          The CPM2 (Communications Processor Module) is a coprocessor on
@@ -719,7 +707,7 @@ config MPC10X_BRIDGE
 
 config FSL_OCP
        bool
-       depends on MPC10X_BRIDGE || PPC_MPC52xx
+       depends on MPC10X_BRIDGE
        default y
 
 config MPC10X_OPENPIC
@@ -825,6 +813,39 @@ config PROC_DEVICETREE
          an image of the device tree that the kernel copies from Open
          Firmware. If unsure, say Y here.
 
+config PPC_RTAS
+       bool "Support for RTAS (RunTime Abstraction Services) in /proc"
+       depends on PPC_OF && PROC_FS
+       ---help---
+         When you use this option, you will be able to use RTAS from
+         userspace.
+
+         RTAS stands for RunTime Abstraction Services and should
+         provide a portable way to access and set system information. This is
+         commonly used on RS/6000 (pSeries) computers.
+
+         You can access RTAS via the special proc file system entry rtas.
+         Don't confuse this rtas entry with the one in /proc/device-tree/rtas
+         which is readonly.
+
+         If you don't know if you can use RTAS look into
+         /proc/device-tree/rtas. If there are some entries, it is very likely
+         that you will be able to use RTAS.
+
+         You can do cool things with rtas. To print out information about
+         various sensors in the system, just do a
+
+         $ cat /proc/rtas/sensors
+
+         or if you power off your machine at night but want it running when
+         you enter your office at 7:45 am, do a
+
+         # date -d 'tomorrow 7:30' +%s > /proc/rtas/poweron
+
+         and shutdown.
+
+         If unsure, say Y.
+
 config PREP_RESIDUAL
        bool "Support for PReP Residual Data"
        depends on PPC_PREP
@@ -1274,7 +1295,7 @@ config DEBUG_SPINLOCK_SLEEP
 
 config KGDB
        bool "Include kgdb kernel debugger"
-       depends on DEBUG_KERNEL && (BROKEN || PPC_GEN550 || 4xx)
+       depends on DEBUG_KERNEL
        select DEBUG_INFO
        help
          Include in-kernel hooks for kgdb, the Linux kernel source level
@@ -1342,7 +1363,7 @@ config BOOTX_TEXT
 
 config SERIAL_TEXT_DEBUG
        bool "Support for early boot texts over serial port"
-       depends on 4xx || GT64260 || LOPEC || PPLUS || PRPMC800 || PPC_GEN550 || PPC_MPC52xx
+       depends on 4xx || GT64260 || LOPEC || PPLUS || PRPMC800 || PPC_GEN550
 
 config PPC_OCP
        bool