X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fppc64%2FKconfig;h=6a4adf98f1be816c3069d2eb504c6d3b49b84d9d;hb=c7b5ebbddf7bcd3651947760f423e3783bbe6573;hp=e9431d81a3446ba010eb48edd0412c1895d6695b;hpb=9bf4aaab3e101692164d49b7ca357651eb691cb6;p=linux-2.6.git diff --git a/arch/ppc64/Kconfig b/arch/ppc64/Kconfig index e9431d81a..6a4adf98f 100644 --- a/arch/ppc64/Kconfig +++ b/arch/ppc64/Kconfig @@ -1,4 +1,4 @@ -# +# # For a description of the syntax of this configuration file, # see Documentation/kbuild/kconfig-language.txt. # @@ -58,16 +58,28 @@ menu "Platform support" choice prompt "Platform Type" - default PPC_PSERIES + default PPC_MULTIPLATFORM config PPC_ISERIES - bool "iSeries" + bool "IBM Legacy iSeries" -config PPC_PSERIES - bool "pSeries / PowerMac G5" +config PPC_MULTIPLATFORM + bool "Generic" endchoice +config PPC_PSERIES + depends on PPC_MULTIPLATFORM + bool " IBM pSeries & new iSeries" + default y + +config PPC_PMAC + depends on PPC_MULTIPLATFORM + bool " Apple G5 based machines" + default y + select ADB_PMU + select U3_DART + config PPC bool default y @@ -77,7 +89,7 @@ config PPC64 default y config PPC_OF - depends on PPC_PSERIES + depends on PPC_MULTIPLATFORM bool default y @@ -85,14 +97,9 @@ config PPC_OF # exception vectors for it config ALTIVEC bool "Support for VMX (Altivec) vector unit" - depends on PPC_PSERIES + depends on PPC_MULTIPLATFORM default y -config PPC_PMAC - depends on PPC_PSERIES - bool "Apple PowerMac G5 support" - select ADB_PMU - config PPC_SPLPAR depends on PPC_PSERIES bool "Support for shared-processor logical partitions" @@ -103,16 +110,10 @@ config PPC_SPLPAR processors, that is, which share physical processors between two or more partitions. -config PMAC_DART - bool "Enable DART/IOMMU on PowerMac (allow >2G of RAM)" - depends on PPC_PMAC - depends on EXPERIMENTAL +config U3_DART + bool + depends on PPC_MULTIPLATFORM default n - help - Enabling DART makes it possible to boot a PowerMac G5 with more - than 2GB of memory. Note that the code is very new and untested - at this time, so it has to be considered experimental. Enabling - this might result in data loss. config PPC_PMAC64 bool @@ -163,7 +164,7 @@ config SMP config IRQ_ALL_CPUS bool "Distribute interrupts on all CPUs by default" - depends on SMP && PPC_PSERIES + depends on SMP && PPC_MULTIPLATFORM help This option gives the kernel permission to distribute IRQs across multiple CPUs. Saying N here will route all IRQs to the first @@ -214,7 +215,7 @@ config MSCHUNKS config PPC_RTAS bool "Proc interface to RTAS" - depends on !PPC_ISERIES + depends on PPC_PSERIES config RTAS_FLASH tristate "Firmware flash interface" @@ -226,8 +227,9 @@ config SCANLOG config LPARCFG tristate "LPAR Configuration Data" + depends on PPC_PSERIES || PPC_ISERIES help - Provide system capacity information via human readable + Provide system capacity information via human readable = pairs through a /proc/ppc64/lparcfg interface. endmenu @@ -272,7 +274,7 @@ source "drivers/pci/Kconfig" config HOTPLUG_CPU bool "Support for hot-pluggable CPUs" - depends on SMP && HOTPLUG && EXPERIMENTAL + depends on SMP && HOTPLUG && EXPERIMENTAL && PPC_PSERIES ---help--- Say Y here to be able to turn CPUs off and on. @@ -343,98 +345,7 @@ config VIOPATH source "arch/ppc64/oprofile/Kconfig" -menu "Kernel hacking" - -config DEBUG_KERNEL - bool "Kernel debugging" - help - Say Y here if you are developing drivers or trying to debug and - identify kernel problems. - -config DEBUG_STACKOVERFLOW - bool "Check for stack overflows" - depends on DEBUG_KERNEL - -config DEBUG_STACK_USAGE - bool "Stack utilization instrumentation" - depends on DEBUG_KERNEL - help - Enables the display of the minimum amount of free stack which each - task has ever had available in the sysrq-T and sysrq-P debug output. - - This option will slow down process creation somewhat. - -config DEBUG_SLAB - bool "Debug memory allocations" - depends on DEBUG_KERNEL - help - Say Y here to have the kernel do limited verification on memory - allocation as well as poisoning memory on free to catch use of freed - memory. - -config MAGIC_SYSRQ - bool "Magic SysRq key" - depends on DEBUG_KERNEL - help - If you say Y here, you will have some control over the system even - if the system crashes for example during kernel debugging (e.g., you - will be able to flush the buffer cache to disk, reboot the system - immediately or dump some status information). This is accomplished - by pressing various keys while holding SysRq (Alt+PrintScreen). It - also works on a serial console (on PC hardware at least), if you - send a BREAK and then within 5 seconds a command keypress. The - keys are documented in . Don't say Y - unless you really know what this hack does. - -config DEBUGGER - bool "Enable debugger hooks" - depends on DEBUG_KERNEL - help - Include in-kernel hooks for kernel debuggers. Unless you are - intending to debug the kernel, say N here. - -config XMON - bool "Include xmon kernel debugger" - depends on DEBUGGER - help - Include in-kernel hooks for the xmon kernel monitor/debugger. - Unless you are intending to debug the kernel, say N here. - -config XMON_DEFAULT - bool "Enable xmon by default" - depends on XMON - -config PPCDBG - bool "Include PPCDBG realtime debugging" - depends on DEBUG_KERNEL - -config DEBUG_INFO - bool "Compile the kernel with debug info" - depends on DEBUG_KERNEL - help - If you say Y here the resulting kernel image will include - debugging info resulting in a larger kernel image. - Say Y here only if you plan to use gdb to debug the kernel. - If you don't debug the kernel, you can say N. - -config IRQSTACKS - bool "Use separate kernel stacks when processing interrupts" - help - If you say Y here the kernel will use separate kernel stacks - for handling hard and soft interrupts. This can help avoid - overflowing the process kernel stacks. - -config SPINLINE - bool "Inline spinlock code at each call site" - depends on SMP && !PPC_SPLPAR && !PPC_ISERIES - help - Say Y if you want to have the code for acquiring spinlocks - and rwlocks inlined at each call site. This makes the kernel - somewhat bigger, but can be useful when profiling the kernel. - - If in doubt, say N. - -endmenu +source "arch/ppc64/Kconfig.debug" source "kernel/vserver/Kconfig" @@ -443,4 +354,3 @@ source "security/Kconfig" source "crypto/Kconfig" source "lib/Kconfig" -