X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=arch%2Fppc%2FKconfig;h=0f1863ed9c1c814abf1509566489b02ab651d664;hb=2398f2c6d34b43025f274fc42eaca34d23ec2320;hp=979590a9baf98291d7c326a2d27a11836ccc7355;hpb=33d9e9b56d5ccd7776fdfe3ecce4a2793dee6fd3;p=safe%2Fjmp%2Flinux-2.6 diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig index 979590a..0f1863e 100644 --- a/arch/ppc/Kconfig +++ b/arch/ppc/Kconfig @@ -4,13 +4,14 @@ mainmenu "Linux/PowerPC Kernel Configuration" +config WORD_SIZE + int + default 32 + config MMU bool default y -config UID16 - bool - config GENERIC_HARDIRQS bool default y @@ -22,17 +23,28 @@ config RWSEM_XCHGADD_ALGORITHM bool default y -config GENERIC_CALIBRATE_DELAY +config ARCH_HAS_ILOG2_U32 bool default y -config HAVE_DEC_LOCK +config ARCH_HAS_ILOG2_U64 + bool + default n + +config GENERIC_HWEIGHT + bool + default y + +config GENERIC_CALIBRATE_DELAY bool default y config PPC bool default y + select HAVE_IDE + select HAVE_OPROFILE + select HAVE_KPROBES config PPC32 bool @@ -43,10 +55,23 @@ config GENERIC_NVRAM bool default y +config GENERIC_FIND_NEXT_BIT + bool + default y + config SCHED_NO_NO_OMIT_FRAME_POINTER bool default y +config ARCH_MAY_HAVE_PC_FDC + bool + default y + +config GENERIC_BUG + bool + default y + depends on BUG + source "init/Kconfig" menu "Processor" @@ -56,68 +81,54 @@ choice default 6xx config 6xx - bool "6xx/7xx/74xx/52xx/82xx/83xx" + bool "6xx/7xx/74xx/52xx/82xx" select PPC_FPU 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, 82xx, 83xx), 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) + types (601, 603, 604, 740, 750, 7400), the older Freescale + (formerly Motorola) embedded versions (821, 823, 850, 855, 860, + 52xx, 82xx), the IBM embedded versions (403 and 405) and + the Book E embedded processors from IBM (44x) and Freescale (85xx). + For support for 64-bit processors, set ARCH=powerpc. 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, & 83xx family has a 603e core, - specific support for that chipset is asked later on. + systems, choose 6xx. + Also note that because the 52xx, 82xx family have a 603e + core, specific support for that chipset is asked later on. config 40x bool "40x" + select PPC_DCR_NATIVE config 44x bool "44x" - -config POWER3 - select PPC_FPU - bool "POWER3" - -config POWER4 - select PPC_FPU - bool "POWER4 and 970 (G5)" + select PPC_DCR_NATIVE config 8xx - depends on BROKEN bool "8xx" - -config E200 - bool "e200" - -config E500 - bool "e500" + select PPC_LIB_RHEAP endchoice config PPC_FPU bool -config BOOKE +config PPC_DCR_NATIVE bool - depends on E200 || E500 - default y + default n -config FSL_BOOKE +config PPC_DCR bool - depends on E200 || E500 + depends on PPC_DCR_NATIVE default y config PTE_64BIT bool - depends on 44x || E500 + depends on 44x default y if 44x - default y if E500 && PHYS_64BIT config PHYS_64BIT - bool 'Large physical address support' if E500 - depends on 44x || E500 + bool + depends on 44x default y if 44x ---help--- This option enables kernel support for larger than 32-bit physical @@ -127,8 +138,8 @@ config PHYS_64BIT config ALTIVEC bool "AltiVec Support" - depends on 6xx || POWER4 - depends on !8260 && !83xx + depends on 6xx + depends on !8260 ---help--- This option enables kernel support for the Altivec extensions to the PowerPC processor. The kernel currently supports saving and restoring @@ -142,24 +153,9 @@ config ALTIVEC If in doubt, say Y here. -config SPE - bool "SPE Support" - depends on E200 || E500 - ---help--- - This option enables kernel support for the Signal Processing - Extensions (SPE) to the PowerPC processor. The kernel currently - supports saving and restoring SPE registers, and turning on the - 'spe enable' bit so user processes can execute SPE instructions. - - This option is only useful if you have a processor that supports - SPE (e500, otherwise known as 85xx series), but does not have any - effect on a non-spe cpu (it does, however add code to the kernel). - - If in doubt, say Y here. - config TAU bool "Thermal Management Support" - depends on 6xx && !8260 && !83xx + depends on 6xx && !8260 help G3 and G4 processors have an on-chip temperature sensor called the 'Thermal Assist Unit (TAU)', which, in theory, can measure the on-die @@ -203,7 +199,7 @@ config TAU_AVERAGE config MATH_EMULATION bool "Math emulation" - depends on 4xx || 8xx || E200 || E500 + depends on 4xx || 8xx ---help--- Some PowerPC chips designed for embedded applications do not have a floating-point unit and therefore do not implement the @@ -217,20 +213,31 @@ config MATH_EMULATION here. Saying Y here will not hurt performance (on any machine) but will increase the size of the kernel. -source "drivers/cpufreq/Kconfig" - -config CPU_FREQ_PMAC - bool "Support for Apple PowerBooks" - depends on CPU_FREQ && ADB_PMU - select CPU_FREQ_TABLE +config KEXEC + bool "kexec system call (EXPERIMENTAL)" + depends on EXPERIMENTAL help - This adds support for frequency switching on Apple PowerBooks, - this currently includes some models of iBook & Titanium - PowerBook. + kexec is a system call that implements the ability to shutdown your + current kernel, and to start another kernel. It is like a reboot + but it is independent of the system firmware. And like a reboot + you can start any kernel with it, not just Linux. + + The name comes from the similarity to the exec system call. + + It is an ongoing process to be certain the hardware in a machine + is properly shutdown, so do not be surprised if this code does not + initially work for you. It may help to enable device hotplugging + support. As of this writing the exact hardware interface is + strongly in flux, so no good recommendation can be made. + + In the GameCube implementation, kexec allows you to load and + run DOL files, including kernel and homebrew DOLs. + +source "drivers/cpufreq/Kconfig" config PPC601_SYNC_FIX bool "Workarounds for PPC601 bugs" - depends on 6xx && (PPC_PREP || PPC_PMAC) + depends on 6xx && PPC_PREP help Some versions of the PPC601 (the first PowerPC chip) have bugs which mean that extra synchronization instructions are required near @@ -243,27 +250,24 @@ config PPC601_SYNC_FIX If in doubt, say Y here. source arch/ppc/platforms/4xx/Kconfig -source arch/ppc/platforms/85xx/Kconfig - -config PPC64BRIDGE - bool - depends on POWER3 || POWER4 - default y config PPC_STD_MMU bool - depends on 6xx || POWER3 || POWER4 + depends on 6xx default y config NOT_COHERENT_CACHE bool - depends on 4xx || 8xx || E200 + depends on 4xx || 8xx default y endmenu menu "Platform options" +config FADS + bool + choice prompt "8xx Machine Type" depends on 8xx @@ -308,14 +312,6 @@ config RPXLITE End of life: end 2000 ? URL: see TQM850L - SPD823TS: - MPC823 based board used in the "Tele Server" product - Manufacturer: Speech Design, - Date of Release: Mid 2000 (?) - End of life: - - URL: - select "English", then "Teleteam Solutions", then "TeleServer" - IVMS8: MPC860 based board used in the "Integrated Voice Mail System", Small Version (8 voice channels) @@ -332,13 +328,6 @@ config RPXLITE End of life: - URL: - SM850: - Service Module (based on TQM850L) - Manufacturer: Dependable Computer Systems, - Date of Release: end 2000 (?) - End of life: mid 2001 (?) - URL: - HERMES: Hermes-Pro ISDN/LAN router with integrated 8 x hub Manufacturer: Multidata Gesellschaft fur Datentechnik und Informatik @@ -379,8 +368,9 @@ config BSEIP 26MB DRAM, 4MB flash, Ethernet, a 16K-gate FPGA, USB, an LCD/video controller, and two RS232 ports. -config FADS +config MPC8XXFADS bool "FADS" + select FADS config TQM823L bool "TQM823L" @@ -425,13 +415,6 @@ config TQM860L config FPS850L bool "FPS850L" -config SPD823TS - bool "SPD823TS" - help - Say Y here to support the Speech Design 823 Tele-Server from Speech - Design, released in 2000. The manufacturer's website is at - . - config IVMS8 bool "IVMS8" help @@ -446,14 +429,6 @@ config IVML24 from Speech Design, released March 2001. The manufacturer's website is at . -config SM850 - bool "SM850" - help - Say Y here to support the Service Module 850 from Dependable - Computer Systems, an SBC based on the TQM850L module by TQ - Components. This board is no longer in production. The - manufacturer's website is at . - config HERMES_PRO bool "HERMES" @@ -490,8 +465,8 @@ endchoice choice prompt "Machine Type" - depends on 6xx || POWER3 || POWER4 - default PPC_MULTIPLATFORM + depends on 6xx + default PPC_PREP ---help--- Linux currently supports several different kinds of PowerPC-based machines: Apple Power Macintoshes and clones (such as the Motorola @@ -501,28 +476,17 @@ choice Platform) machines (including all of the recent IBM RS/6000 and pSeries machines), and several embedded PowerPC systems containing 4xx, 6xx, 7xx, 8xx, 74xx, and 82xx processors. Currently, the - default option is to build a kernel which works on the first three. - - Select CHRP/PowerMac/PReP if configuring for an IBM RS/6000 or - pSeries machine, a Power Macintosh (including iMacs, iBooks and - Powerbooks), or a PReP machine. + default option is to build a kernel which works on PReP. - Select Gemini if configuring for a Synergy Microsystems' Gemini - series Single Board Computer. More information is available at: - . + Note that support for Apple and CHRP machines is now only available + with ARCH=powerpc, and has been removed from this menu. If you + wish to build a kernel for an Apple or CHRP machine, exit this + configuration process and re-run it with ARCH=powerpc. - Select APUS if configuring for a PowerUP Amiga. More information is - available at: . + Select PReP if configuring for a PReP machine. -config PPC_MULTIPLATFORM - bool "CHRP/PowerMac/PReP" - -config APUS - bool "Amiga-APUS" - help - Select APUS if configuring for a PowerUP Amiga. - More information is available at: - . +config PPC_PREP + bool "PReP" config KATANA bool "Artesyn-Katana" @@ -538,9 +502,6 @@ config CPCI690 help Select CPCI690 if configuring a Force CPCI690 cPCI board. -config PCORE - bool "Force-PowerCore" - config POWERPMC250 bool "Force-PowerPMC250" @@ -552,6 +513,7 @@ config CHESTNUT config SPRUCE bool "IBM-Spruce" + select PPC_INDIRECT_PCI config HDPU bool "Sky-HDPU" @@ -559,7 +521,7 @@ config HDPU Select HDPU if configuring a Sky Computers Compute Blade. config HDPU_FEATURES - depends HDPU + depends on HDPU tristate "HDPU-Features" help Select to enable HDPU enhanced features. @@ -572,47 +534,39 @@ config EV64260 config LOPEC bool "Motorola-LoPEC" - -config MCPN765 - bool "Motorola-MCPN765" + select PPC_I8259 config MVME5100 bool "Motorola-MVME5100" + select PPC_INDIRECT_PCI config PPLUS bool "Motorola-PowerPlus" + select PPC_I8259 + select PPC_INDIRECT_PCI config PRPMC750 bool "Motorola-PrPMC750" + select PPC_INDIRECT_PCI config PRPMC800 bool "Motorola-PrPMC800" + select PPC_INDIRECT_PCI config SANDPOINT bool "Motorola-Sandpoint" + select PPC_I8259 help Select SANDPOINT if configuring for a Motorola Sandpoint X3 (any flavor). config RADSTONE_PPC7D bool "Radstone Technology PPC7D board" - -config ADIR - bool "SBS-Adirondack" - -config K2 - bool "SBS-K2" + select PPC_I8259 config PAL4 bool "SBS-Palomar4" -config GEMINI - bool "Synergy-Gemini" - help - Select Gemini if configuring for a Synergy Microsystems' Gemini - series Single Board Computer. More information is available at: - . - config EST8260 bool "EST8260" ---help--- @@ -649,9 +603,6 @@ config TQM8260 End of Life: not yet :-) URL: -config ADS8272 - bool "ADS8272" - config PQ2FADS bool "Freescale-PQ2FADS" help @@ -667,21 +618,23 @@ config LITE5200 much but it's only been tested on this board version. I think this board is also known as IceCube. -config MPC834x_SYS - bool "Freescale MPC834x SYS" +config LITE5200B + bool "Freescale LITE5200B" + depends on LITE5200 help - This option enables support for the MPC 834x SYS evaluation board. + Support for the LITE5200B dev board for the MPC5200 from Freescale. + This is the new board with 2 PCI slots. +config EV64360 + bool "Marvell-EV64360BP" + help + Select EV64360 if configuring a Marvell EV64360BP Evaluation + platform. endchoice -config PQ2ADS - bool - depends on ADS8272 - default y - config TQM8xxL bool - depends on 8xx && (TQM823L || TQM850L || FPS850L || TQM855L || TQM860L || SM850) + depends on 8xx && (TQM823L || TQM850L || FPS850L || TQM855L || TQM860L) default y config EMBEDDEDBOOT @@ -701,26 +654,20 @@ config 8260 this option means that you wish to build a kernel for a machine with an 8260 class CPU. -config 8272 +config CPM1 bool - depends on 6xx - default y if ADS8272 - select 8260 + depends on 8xx + default y help - The MPC8272 CPM has a different internal dpram setup than other CPM2 - devices - -config 83xx - bool - default y if MPC834x_SYS - -config MPC834x - bool - default y if MPC834x_SYS + The CPM1 (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 CPM1 coprocessor + on it (8xx, 827x, 8560). config CPM2 bool depends on 8260 || MPC8560 || MPC8555 + select PPC_LIB_RHEAP default y help The CPM2 (Communications Processor Module) is a coprocessor on @@ -728,57 +675,47 @@ config CPM2 you wish to build a kernel for a machine with a CPM2 coprocessor on it (826x, 827x, 8560). -config PPC_CHRP - bool - depends on PPC_MULTIPLATFORM - default y - -config PPC_PMAC - bool - depends on PPC_MULTIPLATFORM - default y - -config PPC_PMAC64 +config PPC_GEN550 bool - depends on PPC_PMAC && POWER4 + depends on SANDPOINT || SPRUCE || PPLUS || \ + PRPMC750 || PRPMC800 || LOPEC || \ + (EV64260 && !SERIAL_MPSC) || CHESTNUT || RADSTONE_PPC7D default y -config PPC_PREP +config FORCE bool - depends on PPC_MULTIPLATFORM + depends on 6xx && POWERPMC250 default y -config PPC_OF +config GT64260 bool - depends on PPC_PMAC || PPC_CHRP + depends on EV64260 || CPCI690 default y -config PPC_GEN550 +config MV64360 # Really MV64360 & MV64460 bool - depends on SANDPOINT || MCPN765 || SPRUCE || PPLUS || PCORE || \ - PRPMC750 || K2 || PRPMC800 || LOPEC || \ - (EV64260 && !SERIAL_MPSC) || CHESTNUT || RADSTONE_PPC7D || \ - 83xx + depends on CHESTNUT || KATANA || RADSTONE_PPC7D || HDPU || EV64360 default y -config FORCE +config MV64X60 bool - depends on 6xx && (PCORE || POWERPMC250) + depends on (GT64260 || MV64360) + select PPC_INDIRECT_PCI default y -config GT64260 +config MV643XX_ETH_0 bool - depends on EV64260 || CPCI690 + depends on MV643XX_ETH && (KATANA || RADSTONE_PPC7D || EV64360 || HDPU) default y -config MV64360 # Really MV64360 & MV64460 +config MV643XX_ETH_1 bool - depends on CHESTNUT || KATANA || RADSTONE_PPC7D || HDPU + depends on MV643XX_ETH && (KATANA || RADSTONE_PPC7D || EV64360) default y -config MV64X60 +config MV643XX_ETH_2 bool - depends on (GT64260 || MV64360) + depends on MV643XX_ETH && (KATANA || RADSTONE_PPC7D || EV64360) default y menu "Set bridge options" @@ -826,7 +763,8 @@ config EPIC_SERIAL_MODE config MPC10X_BRIDGE bool - depends on PCORE || POWERPMC250 || LOPEC || SANDPOINT + depends on POWERPMC250 || LOPEC || SANDPOINT + select PPC_INDIRECT_PCI default y config MPC10X_OPENPIC @@ -838,9 +776,12 @@ config MPC10X_STORE_GATHERING bool "Enable MPC10x store gathering" depends on MPC10X_BRIDGE -config CPC710_DATA_GATHERING - bool "Enable CPC710 data gathering" - depends on K2 +config SANDPOINT_ENABLE_UART1 + bool "Enable DUART mode on Sandpoint" + depends on SANDPOINT + help + If this option is enabled then the MPC824x processor will run + in DUART mode instead of UART mode. config HARRIER_STORE_GATHERING bool "Enable Harrier store gathering" @@ -849,6 +790,7 @@ config HARRIER_STORE_GATHERING config MVME5100_IPMC761_PRESENT bool "MVME5100 configured with an IPMC761" depends on MVME5100 + select PPC_I8259 config SPRUCE_BAUD_33M bool "Spruce baud clock support" @@ -863,6 +805,7 @@ config PPCBUG_NVRAM default y if PPC_PREP config SMP + depends on PPC_STD_MMU bool "Symmetric multi-processing support" ---help--- This enables support for systems with more than one CPU. If you have @@ -882,7 +825,7 @@ config SMP config IRQ_ALL_CPUS bool "Distribute interrupts on all CPUs by default" - depends on SMP + depends on SMP && !MV64360 help This option gives the kernel permission to distribute IRQs across multiple CPUs. Saying N here will route all IRQs to the first @@ -895,31 +838,18 @@ config NR_CPUS depends on SMP default "4" -config PREEMPT - bool "Preemptible Kernel" - help - This option reduces the latency of the kernel when reacting to - real-time or interactive events by allowing a low priority process to - be preempted even if it is in kernel mode executing a system call. - - Say Y here if you are building a kernel for a desktop, embedded - or real-time system. Say N if you are unsure. - config HIGHMEM bool "High memory support" +config ARCH_POPULATES_NODE_MAP + def_bool y + +source kernel/Kconfig.hz +source kernel/Kconfig.preempt source "mm/Kconfig" source "fs/Kconfig.binfmt" -config PROC_DEVICETREE - bool "Support for Open Firmware device tree in /proc" - depends on PPC_OF && PROC_FS - help - This option adds a device-tree directory under /proc which contains - an image of the device tree that the kernel copies from Open - Firmware. If unsure, say Y here. - config PREP_RESIDUAL bool "Support for PReP Residual Data" depends on PPC_PREP @@ -955,133 +885,9 @@ config CMDLINE some command-line options at build time by entering them here. In most cases you will need to specify the root device here. -config AMIGA - bool - depends on APUS - default y - help - This option enables support for the Amiga series of computers. - -config ZORRO - bool - depends on APUS - default y - help - This enables support for the Zorro bus in the Amiga. If you have - expansion cards in your Amiga that conform to the Amiga - AutoConfig(tm) specification, say Y, otherwise N. Note that even - expansion cards that do not fit in the Zorro slots but fit in e.g. - the CPU slot may fall in this category, so you have to say Y to let - Linux use these. - -config ABSTRACT_CONSOLE - bool - depends on APUS - default y - -config APUS_FAST_EXCEPT - bool - depends on APUS - default y - -config AMIGA_PCMCIA - bool "Amiga 1200/600 PCMCIA support" - depends on APUS && EXPERIMENTAL - help - Include support in the kernel for pcmcia on Amiga 1200 and Amiga - 600. If you intend to use pcmcia cards say Y; otherwise say N. - -config AMIGA_BUILTIN_SERIAL - tristate "Amiga builtin serial support" - depends on APUS - help - If you want to use your Amiga's built-in serial port in Linux, - answer Y. - - To compile this driver as a module, choose M here. - -config GVPIOEXT - tristate "GVP IO-Extender support" - depends on APUS - help - If you want to use a GVP IO-Extender serial card in Linux, say Y. - Otherwise, say N. - -config GVPIOEXT_LP - tristate "GVP IO-Extender parallel printer support" - depends on GVPIOEXT - help - Say Y to enable driving a printer from the parallel port on your - GVP IO-Extender card, N otherwise. - -config GVPIOEXT_PLIP - tristate "GVP IO-Extender PLIP support" - depends on GVPIOEXT - help - Say Y to enable doing IP over the parallel port on your GVP - IO-Extender card, N otherwise. - -config MULTIFACE_III_TTY - tristate "Multiface Card III serial support" - depends on APUS - help - If you want to use a Multiface III card's serial port in Linux, - answer Y. - - To compile this driver as a module, choose M here. - -config A2232 - tristate "Commodore A2232 serial support (EXPERIMENTAL)" - depends on EXPERIMENTAL && APUS - ---help--- - This option supports the 2232 7-port serial card shipped with the - Amiga 2000 and other Zorro-bus machines, dating from 1989. At - a max of 19,200 bps, the ports are served by a 6551 ACIA UART chip - each, plus a 8520 CIA, and a master 6502 CPU and buffer as well. The - ports were connected with 8 pin DIN connectors on the card bracket, - for which 8 pin to DB25 adapters were supplied. The card also had - jumpers internally to toggle various pinning configurations. - - This driver can be built as a module; but then "generic_serial" - will also be built as a module. This has to be loaded before - "ser_a2232". If you want to do this, answer M here. - -config WHIPPET_SERIAL - tristate "Hisoft Whippet PCMCIA serial support" - depends on AMIGA_PCMCIA - help - HiSoft has a web page at , but there - is no listing for the Whippet in their Amiga section. - -config APNE - tristate "PCMCIA NE2000 support" - depends on AMIGA_PCMCIA - help - If you have a PCMCIA NE2000 compatible adapter, say Y. Otherwise, - say N. - - To compile this driver as a module, choose M here: the - module will be called apne. - -config SERIAL_CONSOLE - bool "Support for serial port console" - depends on APUS && (AMIGA_BUILTIN_SERIAL=y || GVPIOEXT=y || MULTIFACE_III_TTY=y) - -config HEARTBEAT - bool "Use power LED as a heartbeat" - depends on APUS - help - Use the power-on LED on your machine as a load meter. The exact - behavior is platform-dependent, but normally the flash frequency is - a hyperbolic function of the 5-minute load average. - -config PROC_HARDWARE - bool "/proc/hardware support" - depends on APUS - -source "drivers/zorro/Kconfig" - +if BROKEN source kernel/power/Kconfig +endif config SECCOMP bool "Enable seccomp to safely compute untrusted bytecode" @@ -1110,7 +916,7 @@ menu "Bus options" config ISA bool "Support for ISA-bus hardware" - depends on PPC_PREP || PPC_CHRP + depends on PPC_PREP help Find out whether you have ISA slots on your motherboard. ISA is the name of a bus system, i.e. the way the CPU talks to the other stuff @@ -1118,11 +924,26 @@ config ISA have an IBM RS/6000 or pSeries machine or a PReP machine, say Y. If you have an embedded board, consult your board documentation. +config ZONE_DMA + bool + default y + config GENERIC_ISA_DMA bool - depends on POWER3 || POWER4 || 6xx && !CPM2 + depends on 6xx && !CPM2 default y +config PPC_I8259 + bool + default y if PPC_PREP + default n + +config PPC_INDIRECT_PCI + bool + depends on PCI + default y if 40x || 44x || PPC_PREP + default n + config EISA bool help @@ -1137,9 +958,8 @@ config MCA bool config PCI - bool "PCI support" if 40x || CPM2 || 83xx || 85xx || PPC_MPC52xx - default y if !40x && !CPM2 && !8xx && !APUS && !83xx && !85xx - default PCI_PERMEDIA if !4xx && !CPM2 && !8xx && APUS + bool "PCI support" if 40x || CPM2 || PPC_MPC52xx + default y if !40x && !CPM2 && !8xx default PCI_QSPAN if !4xx && !CPM2 && 8xx help Find out whether your system includes a PCI bus. PCI is the name of @@ -1148,12 +968,15 @@ config PCI infrastructure code to support PCI bus devices. config PCI_DOMAINS - bool - default PCI + def_bool PCI + +config PCI_SYSCALL + def_bool PCI config PCI_QSPAN bool "QSpan PCI" depends on !4xx && !CPM2 && 8xx + select PPC_I8259 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. @@ -1161,15 +984,16 @@ config PCI_QSPAN config PCI_8260 bool depends on PCI && 8260 + select PPC_INDIRECT_PCI default y config 8260_PCI9 - bool " Enable workaround for MPC826x erratum PCI 9" - depends on PCI_8260 && !ADS8272 + bool "Enable workaround for MPC826x erratum PCI 9" + depends on PCI_8260 default y choice - prompt " IDMA channel for PCI 9 workaround" + prompt "IDMA channel for PCI 9 workaround" depends on 8260_PCI9 config 8260_PCI9_IDMA1 @@ -1186,14 +1010,18 @@ config 8260_PCI9_IDMA4 endchoice -config PCI_PERMEDIA - bool "PCI for Permedia2" - depends on !4xx && !8xx && APUS - source "drivers/pci/Kconfig" source "drivers/pcmcia/Kconfig" +config RAPIDIO + bool "RapidIO support" if MPC8540 || MPC8560 + help + If you say Y here, the kernel will include drivers and + infrastructure code to support RapidIO interconnect devices. + +source "drivers/rapidio/Kconfig" + endmenu menu "Advanced setup" @@ -1275,7 +1103,7 @@ config CONSISTENT_START_BOOL depends on ADVANCED_OPTIONS && NOT_COHERENT_CACHE help This option allows you to set the base virtual address - of the the consistent memory pool. This pool of virtual + of the consistent memory pool. This pool of virtual memory is used to make consistent memory allocations. config CONSISTENT_START @@ -1286,7 +1114,7 @@ config CONSISTENT_SIZE_BOOL bool "Set custom consistent memory pool size" depends on ADVANCED_OPTIONS && NOT_COHERENT_CACHE help - This option allows you to set the size of the the + This option allows you to set the size of the consistent memory pool. This pool of virtual memory is used to make consistent memory allocations. @@ -1296,7 +1124,7 @@ config CONSISTENT_SIZE config BOOT_LOAD_BOOL bool "Set the boot link/load address" - depends on ADVANCED_OPTIONS && !PPC_MULTIPLATFORM + depends on ADVANCED_OPTIONS && !PPC_PREP help This option allows you to set the initial load address of the zImage or zImage.initrd file. This can be useful if you are on a board @@ -1313,8 +1141,14 @@ config BOOT_LOAD config PIN_TLB bool "Pinned Kernel TLBs (860 ONLY)" depends on ADVANCED_OPTIONS && 8xx + +config PPC_LIB_RHEAP + bool + endmenu +source "net/Kconfig" + source "drivers/Kconfig" source "fs/Kconfig" @@ -1345,8 +1179,6 @@ endmenu source "lib/Kconfig" -source "arch/ppc/oprofile/Kconfig" - source "arch/ppc/Kconfig.debug" source "security/Kconfig"