X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=arch%2Fppc%2FKconfig;fp=arch%2Fppc%2FKconfig;h=a598ec35f8594c209061c940e2f9c870a1a9beaf;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=f0d02a8d11ba371482a3b855bc1aa2cd70b8cb35;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig index f0d02a8d1..a598ec35f 100644 --- a/arch/ppc/Kconfig +++ b/arch/ppc/Kconfig @@ -19,10 +19,6 @@ config RWSEM_XCHGADD_ALGORITHM bool default y -config GENERIC_HWEIGHT - bool - default y - config GENERIC_CALIBRATE_DELAY bool default y @@ -40,10 +36,6 @@ config GENERIC_NVRAM bool default y -config GENERIC_FIND_NEXT_BIT - bool - default y - config SCHED_NO_NO_OMIT_FRAME_POINTER bool default y @@ -65,15 +57,15 @@ config 6xx select PPC_FPU help There are four types of PowerPC chips supported. The more common - types (601, 603, 604, 740, 750, 7400), the older Freescale - (formerly Motorola) embedded versions (821, 823, 850, 855, 860, - 52xx, 82xx, 83xx), 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. + 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 POWER3 processor. + (For support for more recent 64-bit processors, set ARCH=powerpc.) Unless you are building a kernel for one of the embedded processor - systems, choose 6xx. - Also note that because the 52xx, 82xx, & 83xx family have a 603e - core, specific support for that chipset is asked later on. + systems or a POWER3-based IBM RS/6000, 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. config 40x bool "40x" @@ -81,6 +73,10 @@ config 40x config 44x bool "44x" +config POWER3 + select PPC_FPU + bool "POWER3" + config 8xx bool "8xx" @@ -219,10 +215,10 @@ config KEXEC help 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 + but it is indepedent 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. + The name comes from the similiarity 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 @@ -252,9 +248,14 @@ config PPC601_SYNC_FIX source arch/ppc/platforms/4xx/Kconfig source arch/ppc/platforms/85xx/Kconfig +config PPC64BRIDGE + bool + depends on POWER3 + default y + config PPC_STD_MMU bool - depends on 6xx + depends on 6xx || POWER3 default y config NOT_COHERENT_CACHE @@ -480,57 +481,10 @@ config WINCEPT endchoice -menu "Freescale Ethernet driver platform-specific options" - depends on FS_ENET - - config MPC8xx_SECOND_ETH - bool "Second Ethernet channel" - depends on (MPC885ADS || MPC86XADS) - default y - help - This enables support for second Ethernet on MPC885ADS and MPC86xADS boards. - The latter will use SCC1, for 885ADS you can select it below. - - choice - prompt "Second Ethernet channel" - depends on MPC8xx_SECOND_ETH - default MPC8xx_SECOND_ETH_FEC2 - - config MPC8xx_SECOND_ETH_FEC2 - bool "FEC2" - depends on MPC885ADS - help - Enable FEC2 to serve as 2-nd Ethernet channel. Note that SMC2 - (often 2-nd UART) will not work if this is enabled. - - config MPC8xx_SECOND_ETH_SCC1 - bool "SCC1" - depends on MPC86XADS - select MPC8xx_SCC_ENET_FIXED - help - Enable SCC1 to serve as 2-nd Ethernet channel. Note that SMC1 - (often 1-nd UART) will not work if this is enabled. - - config MPC8xx_SECOND_ETH_SCC3 - bool "SCC3" - depends on MPC885ADS - help - Enable SCC3 to serve as 2-nd Ethernet channel. Note that SMC1 - (often 1-nd UART) will not work if this is enabled. - - endchoice - - config MPC8xx_SCC_ENET_FIXED - depends on MPC8xx_SECOND_ETH_SCC - default n - bool "Use fixed MII-less mode for SCC Ethernet" - -endmenu - choice prompt "Machine Type" - depends on 6xx - default PPC_PREP + depends on 6xx || POWER3 + default PPC_MULTIPLATFORM ---help--- Linux currently supports several different kinds of PowerPC-based machines: Apple Power Macintoshes and clones (such as the Motorola @@ -540,14 +494,15 @@ 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 PReP. + default option is to build a kernel which works on PReP and CHRP. - 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. + Note that support for Apple 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 machine, exit this configuration + process and re-run it with ARCH=powerpc. - Select PReP if configuring for a PReP machine. + Select CHRP/PReP if configuring for an IBM RS/6000 or + pSeries machine, or a PReP machine. Select Gemini if configuring for a Synergy Microsystems' Gemini series Single Board Computer. More information is available at: @@ -556,8 +511,8 @@ choice Select APUS if configuring for a PowerUP Amiga. More information is available at: . -config PPC_PREP - bool "PReP" +config PPC_MULTIPLATFORM + bool "CHRP/PReP" config APUS bool "Amiga-APUS" @@ -709,13 +664,6 @@ config LITE5200 much but it's only been tested on this board version. I think this board is also known as IceCube. -config LITE5200B - bool "Freescale LITE5200B" - depends LITE5200 - help - Support for the LITE5200B dev board for the MPC5200 from Freescale. - This is the new board with 2 PCI slots. - config MPC834x_SYS bool "Freescale MPC834x SYS" help @@ -801,6 +749,25 @@ config CPM2 you wish to build a kernel for a machine with a CPM2 coprocessor on it (826x, 827x, 8560). +config PPC_CHRP + bool "Support for CHRP (Common Hardware Reference Platform) machines" + depends on PPC_MULTIPLATFORM + select PPC_I8259 + select PPC_INDIRECT_PCI + default y + +config PPC_PREP + bool "Support for PReP (PowerPC Reference Platform) machines" + depends on PPC_MULTIPLATFORM + select PPC_I8259 + select PPC_INDIRECT_PCI + default y + +config PPC_OF + bool + depends on PPC_CHRP + default y + config PPC_GEN550 bool depends on SANDPOINT || SPRUCE || PPLUS || \ @@ -959,6 +926,14 @@ 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 @@ -1151,7 +1126,8 @@ menu "Bus options" config ISA bool "Support for ISA-bus hardware" - depends on PPC_PREP + depends on PPC_PREP || PPC_CHRP + select PPC_I8259 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 @@ -1161,18 +1137,18 @@ config ISA config GENERIC_ISA_DMA bool - depends on 6xx && !CPM2 + depends on POWER3 || 6xx && !CPM2 default y config PPC_I8259 bool - default y if 85xx || PPC_PREP + default y if 85xx default n config PPC_INDIRECT_PCI bool depends on PCI - default y if 40x || 44x || 85xx || 83xx || PPC_PREP + default y if 40x || 44x || 85xx || 83xx default n config EISA @@ -1363,7 +1339,7 @@ config CONSISTENT_SIZE config BOOT_LOAD_BOOL bool "Set the boot link/load address" - depends on ADVANCED_OPTIONS && !PPC_PREP + depends on ADVANCED_OPTIONS && !PPC_MULTIPLATFORM 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