X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fppc%2FKconfig;h=729f8b203e3e06ee74ec040eeef009066f67ef8f;hb=5e3b93f248c98873cc843e83092bb8da92ac85a2;hp=051832b2e31f851616f0ad47dbda1467e793ef06;hpb=a91482bdcc2e0f6035702e46f1b99043a0893346;p=linux-2.6.git diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig index 051832b2e..729f8b203 100644 --- 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 or + For more information, take a look at linux/Documentation/cpu-freq or at If in doubt, say N. @@ -324,7 +324,7 @@ config RPXLITE HERMES: Hermes-Pro ISDN/LAN router with integrated 8 x hub - Manufacturer: Multidata Gesellschaft für Datentechnik und Informatik + Manufacturer: Multidata Gesellschaft für Datentechnik und Informatik Date of Release: 2000 (?) End of life: - @@ -583,7 +583,7 @@ config SBC82xx config SBS8260 bool "SBS8260" -config RPX8260 +config RPX6 bool "RPXSUPER" config TQM8260 @@ -598,25 +598,8 @@ config TQM8260 End of Life: not yet :-) URL: -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 - bool - depends on ADS8272 - default y - config TQM8xxL bool depends on 8xx && (TQM823L || TQM850L || FPS850L || TQM855L || TQM860L || SM850) @@ -626,37 +609,16 @@ 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 - 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 - an 8260 class CPU. - -config 8272 - bool + bool "MPC8260 CPM Support" if WILLOW depends on 6xx - default y if ADS8272 - select 8260 - help - The MPC8272 CPM has a different internal dpram setup than other CPM2 - devices - -config CPM2 - bool - depends on 8260 || MPC8560 - default y + default y if TQM8260 || RPXSUPER || EST8260 || SBS8260 || SBC82xx help - The CPM2 (Communications Processor Module) is a coprocessor on - embedded CPUs made by Motorola. Selecting this option means that - you wish to build a kernel for a machine with a CPM2 coprocessor - on it (826x, 827x, 8560). + The MPC8260 CPM (Communications Processor Module) is a typical + embedded CPU made by Motorola. Selecting this option means that + you wish to build a kernel for a machine with specifically an 8260 + for a CPU. config PPC_CHRP bool @@ -717,16 +679,6 @@ config MPC10X_BRIDGE depends on PCORE || POWERPMC250 || LOPEC || SANDPOINT default y -config FSL_OCP - bool - depends on MPC10X_BRIDGE || PPC_MPC52xx - default y - -config MPC10X_OPENPIC - bool - depends on POWERPMC250 || LOPEC || SANDPOINT - default y - config MPC10X_STORE_GATHERING bool "Enable MPC10x store gathering" depends on MPC10X_BRIDGE @@ -749,11 +701,11 @@ config SPRUCE_BAUD_33M config PC_KEYBOARD bool "PC PS/2 style Keyboard" - depends on 4xx || CPM2 + depends on 4xx || 8260 config SERIAL_CONSOLE bool - depends on 8xx + depends on 8xx || 8260 default y config SERIAL_CONSOLE_BAUD @@ -825,6 +777,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 @@ -1001,7 +986,7 @@ config ISA config GENERIC_ISA_DMA bool - depends on POWER3 || POWER4 || 6xx && !CPM2 + depends on POWER3 || POWER4 || 6xx && !8260 default y config EISA @@ -1018,10 +1003,10 @@ config MCA bool config PCI - bool "PCI support" if 40x || CPM2 || 85xx - default y if !40x && !CPM2 && !8xx && !APUS && !85xx - default PCI_PERMEDIA if !4xx && !CPM2 && !8xx && APUS - default PCI_QSPAN if !4xx && !CPM2 && 8xx + bool "PCI support" if 40x || 8260 || 85xx + default y if !40x && !8260 && !8xx && !APUS && !85xx + default PCI_PERMEDIA if !4xx && !8260 && !8xx && APUS + default PCI_QSPAN if !4xx && !8260 && 8xx help Find out whether your system includes a PCI bus. PCI is the name of a bus system, i.e. the way the CPU talks to the other stuff inside @@ -1034,39 +1019,11 @@ config PCI_DOMAINS config PCI_QSPAN bool "QSpan PCI" - depends on !4xx && !CPM2 && 8xx + depends on !4xx && !8260 && 8xx help Say Y here if you have a system based on a Motorola 8xx-series embedded processor with a QSPAN PCI interface, otherwise say N. -config PCI_8260 - bool - depends on PCI && 8260 && !8272 - default y - -config 8260_PCI9 - bool " Enable workaround for MPC826x erratum PCI 9" - depends on PCI_8260 - default y - -choice - prompt " IDMA channel for PCI 9 workaround" - depends on 8260_PCI9 - -config 8260_PCI9_IDMA1 - bool "IDMA1" - -config 8260_PCI9_IDMA2 - bool "IDMA2" - -config 8260_PCI9_IDMA3 - bool "IDMA3" - -config 8260_PCI9_IDMA4 - bool "IDMA4" - -endchoice - config PCI_PERMEDIA bool "PCI for Permedia2" depends on !4xx && !8xx && APUS @@ -1226,7 +1183,6 @@ endmenu source "lib/Kconfig" -source "arch/ppc/oprofile/Kconfig" menu "Kernel hacking" @@ -1274,7 +1230,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 @@ -1302,7 +1258,7 @@ endchoice config KGDB_CONSOLE bool "Enable serial console thru kgdb port" - depends on KGDB && 8xx || CPM2 + depends on KGDB && 8xx || 8260 help If you enable this, all serial console messages will be sent over the gdb stub. @@ -1342,7 +1298,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