Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3771f2d9 authored by Paul Mackerras's avatar Paul Mackerras
Browse files

Merge branch 'ppc_kconfig' of... 

Merge branch 'ppc_kconfig' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into for-2.6.22
parents 70b52b38 4330f5da

arch/powerpc/Kconfig

+1 −384
Original line number Diff line number Diff line
@@ -372,383 +372,7 @@ endmenu 


source "init/Kconfig"



menu "Platform support"

	depends on PPC64 || CLASSIC32



choice

	prompt "Machine type"

	default PPC_MULTIPLATFORM



config PPC_MULTIPLATFORM

	bool "Generic desktop/server/laptop"

	help

	  Select this option if configuring for an IBM pSeries or

	  RS/6000 machine, an Apple machine, or a PReP, CHRP,

	  Maple or Cell-based machine.



config EMBEDDED6xx

	bool "Embedded 6xx/7xx/7xxx-based board"

	depends on PPC32 && (BROKEN||BROKEN_ON_SMP)



config APUS

	bool "Amiga-APUS"

	depends on PPC32 && BROKEN

	help

	  Select APUS if configuring for a PowerUP Amiga.

	  More information is available at:

	  <http://linux-apus.sourceforge.net/>.

endchoice



config QUICC_ENGINE

	bool

	depends on PPC_MPC836x || PPC_MPC832x

	default y

	help

	  The QUICC Engine (QE) is a new generation of communications

	  coprocessors on Freescale embedded CPUs (akin to CPM in older chips).

	  Selecting this option means that you wish to build a kernel

	  for a machine with a QE coprocessor.



config PPC_PSERIES

	depends on PPC_MULTIPLATFORM && PPC64

	bool "IBM pSeries & new (POWER5-based) iSeries"

	select MPIC

	select PPC_I8259

	select PPC_RTAS

	select RTAS_ERROR_LOGGING

	select PPC_UDBG_16550

	select PPC_NATIVE

	default y



config PPC_ISERIES

	bool "IBM Legacy iSeries"

	depends on PPC_MULTIPLATFORM && PPC64

	select PPC_INDIRECT_IO



config PPC_CHRP

	bool "Common Hardware Reference Platform (CHRP) based machines"

	depends on PPC_MULTIPLATFORM && PPC32

	select MPIC

	select PPC_I8259

	select PPC_INDIRECT_PCI

	select PPC_RTAS

	select PPC_MPC106

	select PPC_UDBG_16550

	select PPC_NATIVE

	default y



config PPC_MPC52xx

	bool

	default n



config PPC_MPC5200

	bool

	select PPC_MPC52xx

	default n



config PPC_MPC5200_BUGFIX

	bool "MPC5200 (L25R) bugfix support"

	depends on PPC_MPC5200

	default n

	help

	  Enable workarounds for original MPC5200 errata.  This is not required

	  for MPC5200B based boards.



	  It is safe to say 'Y' here



config PPC_EFIKA

	bool "bPlan Efika 5k2. MPC5200B based computer"

	depends on PPC_MULTIPLATFORM && PPC32

	select PPC_RTAS

	select RTAS_PROC

	select PPC_MPC52xx

	select PPC_NATIVE

	default n



config PPC_LITE5200

	bool "Freescale Lite5200 Eval Board"

	depends on PPC_MULTIPLATFORM && PPC32

	select PPC_MPC5200

	default n



config PPC_PMAC

	bool "Apple PowerMac based machines"

	depends on PPC_MULTIPLATFORM

	select MPIC

	select PPC_INDIRECT_PCI if PPC32

	select PPC_MPC106 if PPC32

	select PPC_NATIVE

	default y



config PPC_PMAC64

	bool

	depends on PPC_PMAC && POWER4

	select MPIC

	select U3_DART

	select MPIC_BROKEN_U3

	select GENERIC_TBSYNC

	select PPC_970_NAP

	default y



config PPC_PREP

	bool "PowerPC Reference Platform (PReP) based machines"

	depends on PPC_MULTIPLATFORM && PPC32 && BROKEN

	select MPIC

	select PPC_I8259

	select PPC_INDIRECT_PCI

	select PPC_UDBG_16550

	select PPC_NATIVE

	default n



config PPC_MAPLE

	depends on PPC_MULTIPLATFORM && PPC64

	bool "Maple 970FX Evaluation Board"

	select MPIC

	select U3_DART

	select MPIC_BROKEN_U3

	select GENERIC_TBSYNC

	select PPC_UDBG_16550

	select PPC_970_NAP

	select PPC_NATIVE

	select PPC_RTAS

	select MMIO_NVRAM

	select ATA_NONSTANDARD if ATA

	default n

	help

          This option enables support for the Maple 970FX Evaluation Board.

	  For more information, refer to <http://www.970eval.com>



config PPC_PASEMI

	depends on PPC_MULTIPLATFORM && PPC64

	bool "PA Semi SoC-based platforms"

	default n

	select MPIC

	select PPC_UDBG_16550

	select GENERIC_TBSYNC

	select PPC_NATIVE

	help

	  This option enables support for PA Semi's PWRficient line

	  of SoC processors, including PA6T-1682M



config PPC_CELL

	bool

	default n



config PPC_CELL_NATIVE

	bool

	select PPC_CELL

	select PPC_DCR_MMIO

	select PPC_OF_PLATFORM_PCI

	select PPC_INDIRECT_IO

	select PPC_NATIVE

	select MPIC

	default n



config PPC_IBM_CELL_BLADE

	bool "IBM Cell Blade"

	depends on PPC_MULTIPLATFORM && PPC64

	select PPC_CELL_NATIVE

	select PPC_RTAS

	select MMIO_NVRAM

	select PPC_UDBG_16550

	select UDBG_RTAS_CONSOLE



config PPC_PS3

	bool "Sony PS3 (incomplete)"

	depends on PPC_MULTIPLATFORM && PPC64

	select PPC_CELL

	select USB_ARCH_HAS_OHCI

	select USB_OHCI_LITTLE_ENDIAN

	select USB_OHCI_BIG_ENDIAN_MMIO

	select USB_ARCH_HAS_EHCI

	select USB_EHCI_BIG_ENDIAN_MMIO

	help

	  This option enables support for the Sony PS3 game console

	  and other platforms using the PS3 hypervisor.

	  Support for this platform is not yet complete, so

	  enabling this will not result in a bootable kernel on a

	  PS3 system.



config PPC_CELLEB

	bool "Toshiba's Cell Reference Set 'Celleb' Architecture"

	depends on PPC_MULTIPLATFORM && PPC64

	select PPC_CELL

	select PPC_OF_PLATFORM_PCI

	select HAS_TXX9_SERIAL

	select PPC_UDBG_BEAT

	select USB_OHCI_BIG_ENDIAN_MMIO

	select USB_EHCI_BIG_ENDIAN_MMIO



config PPC_NATIVE

	bool

	depends on PPC_MULTIPLATFORM

	help

	  Support for running natively on the hardware, i.e. without

	  a hypervisor. This option is not user-selectable but should

	  be selected by all platforms that need it.



config UDBG_RTAS_CONSOLE

	bool "RTAS based debug console"

	depends on PPC_RTAS

	default n



config PPC_UDBG_BEAT

	bool "BEAT based debug console"

	depends on PPC_CELLEB

	default n



config XICS

	depends on PPC_PSERIES

	bool

	default y



config U3_DART

	bool 

	depends on PPC_MULTIPLATFORM && PPC64

	default n



config PPC_RTAS

	bool

	default n



config RTAS_ERROR_LOGGING

	bool

	depends on PPC_RTAS

	default n



config RTAS_PROC

	bool "Proc interface to RTAS"

	depends on PPC_RTAS

	default y



config RTAS_FLASH

	tristate "Firmware flash interface"

	depends on PPC64 && RTAS_PROC



config PPC_PMI

	tristate "Support for PMI"

	depends PPC_IBM_CELL_BLADE

	help

	  PMI (Platform Management Interrupt) is a way to

	  communicate with the BMC (Baseboard Mangement Controller).

	  It is used in some IBM Cell blades.

	default m



config MMIO_NVRAM

	bool

	default n



config MPIC_BROKEN_U3

	bool

	depends on PPC_MAPLE

	default y



config IBMVIO

	depends on PPC_PSERIES || PPC_ISERIES

	bool

	default y



config IBMEBUS

	depends on PPC_PSERIES

	bool "Support for GX bus based adapters"

	help

	  Bus device driver for GX bus based adapters.



config PPC_MPC106

	bool

	default n



config PPC_970_NAP

	bool

	default n



config PPC_INDIRECT_IO

	bool

	select GENERIC_IOMAP

	default n



config GENERIC_IOMAP

	bool

	default n



source "drivers/cpufreq/Kconfig"



config CPU_FREQ_PMAC

	bool "Support for Apple PowerBooks"

	depends on CPU_FREQ && ADB_PMU && PPC32

	select CPU_FREQ_TABLE

	help

	  This adds support for frequency switching on Apple PowerBooks,

	  this currently includes some models of iBook & Titanium

	  PowerBook.



config CPU_FREQ_PMAC64

	bool "Support for some Apple G5s"

	depends on CPU_FREQ && PPC64

	select CPU_FREQ_TABLE

	help

	  This adds support for frequency switching on Apple iMac G5,

	  and some of the more recent desktop G5 machines as well.



config PPC601_SYNC_FIX

	bool "Workarounds for PPC601 bugs"

	depends on 6xx && (PPC_PREP || PPC_PMAC)

	help

	  Some versions of the PPC601 (the first PowerPC chip) have bugs which

	  mean that extra synchronization instructions are required near

	  certain instructions, typically those that make major changes to the

	  CPU state.  These extra instructions reduce performance slightly.

	  If you say N here, these extra instructions will not be included,

	  resulting in a kernel which will run faster but may not run at all

	  on some systems with the PPC601 chip.



	  If in doubt, say Y here.



config TAU

	bool "On-chip CPU temperature sensor support"

	depends on 6xx

	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

	  temperature within 2-4 degrees Celsius. This option shows the current

	  on-die temperature in /proc/cpuinfo if the cpu supports it.



	  Unfortunately, on some chip revisions, this sensor is very inaccurate

	  and in many cases, does not work at all, so don't assume the cpu

	  temp is actually what /proc/cpuinfo says it is.



config TAU_INT

	bool "Interrupt driven TAU driver (DANGEROUS)"

	depends on TAU

	---help---

	  The TAU supports an interrupt driven mode which causes an interrupt

	  whenever the temperature goes out of range. This is the fastest way

	  to get notified the temp has exceeded a range. With this option off,

	  a timer is used to re-check the temperature periodically.



	  However, on some cpus it appears that the TAU interrupt hardware

	  is buggy and can cause a situation which would lead unexplained hard

	  lockups.



	  Unless you are extending the TAU driver, or enjoy kernel/hardware

	  debugging, leave this option off.



config TAU_AVERAGE

	bool "Average high and low temp"

	depends on TAU

	---help---

	  The TAU hardware can compare the temperature to an upper and lower

	  bound.  The default behavior is to show both the upper and lower

	  bound in /proc/cpuinfo. If the range is large, the temperature is

	  either changing a lot, or the TAU hardware is broken (likely on some

	  G4's). If the range is small (around 4 degrees), the temperature is

	  relatively stable.  If you say Y here, a single temperature value,

	  halfway between the upper and lower bounds, will be reported in

	  /proc/cpuinfo.



	  If in doubt, say N here.



endmenu

source "arch/powerpc/platforms/Kconfig"



source arch/powerpc/platforms/embedded6xx/Kconfig

source arch/powerpc/platforms/4xx/Kconfig
@@ -757,9 +381,6 @@ source arch/powerpc/platforms/83xx/Kconfig 
source arch/powerpc/platforms/85xx/Kconfig

source arch/powerpc/platforms/86xx/Kconfig

source arch/powerpc/platforms/8xx/Kconfig

source arch/powerpc/platforms/cell/Kconfig

source arch/powerpc/platforms/ps3/Kconfig

source arch/powerpc/platforms/pasemi/Kconfig



menu "Kernel options"
@@ -864,7 +485,6 @@ config IRQ_ALL_CPUS 
	  CPU.  Generally saying Y is safe, although some problems have been

	  reported with SMP Power Macintoshes with this option enabled.



source "arch/powerpc/platforms/pseries/Kconfig"



config NUMA

	bool "NUMA support"
@@ -936,8 +556,6 @@ config PROC_DEVICETREE 
	  an image of the device tree that the kernel copies from Open

	  Firmware or other boot firmware. If unsure, say Y here.



source "arch/powerpc/platforms/prep/Kconfig"



config CMDLINE_BOOL

	bool "Default bootloader kernel arguments"
@@ -1234,7 +852,6 @@ source "fs/Kconfig" 


source "arch/powerpc/sysdev/qe_lib/Kconfig"



source "arch/powerpc/platforms/iseries/Kconfig"



source "lib/Kconfig"

arch/powerpc/Kconfig.debug

+1 −2
Original line number Diff line number Diff line
@@ -132,8 +132,7 @@ config BOOTX_TEXT 


config SERIAL_TEXT_DEBUG

	bool "Support for early boot texts over serial port"

	depends on 4xx || LOPEC || MV64X60 || PPLUS || PRPMC800 || \

		PPC_GEN550 || PPC_MPC52xx

	depends on 4xx



config PPC_EARLY_DEBUG

	bool "Early debugging (dangerous)"

arch/powerpc/platforms/52xx/Kconfig

0 → 100644
+35 −0
Original line number Diff line number Diff line 
config PPC_MPC52xx

	bool

	default n



config PPC_MPC5200

	bool

	select PPC_MPC52xx

	default n



config PPC_MPC5200_BUGFIX

	bool "MPC5200 (L25R) bugfix support"

	depends on PPC_MPC5200

	default n

	help

	  Enable workarounds for original MPC5200 errata.  This is not required

	  for MPC5200B based boards.



	  It is safe to say 'Y' here



config PPC_EFIKA

	bool "bPlan Efika 5k2. MPC5200B based computer"

	depends on PPC_MULTIPLATFORM && PPC32

	select PPC_RTAS

	select RTAS_PROC

	select PPC_MPC52xx

	select PPC_NATIVE

	default n



config PPC_LITE5200

	bool "Freescale Lite5200 Eval Board"

	depends on PPC_MULTIPLATFORM && PPC32

	select PPC_MPC5200

	default n

arch/powerpc/platforms/82xx/Kconfig

+35 −0
Original line number Diff line number Diff line
@@ -18,4 +18,39 @@ config MPC82xx_ADS 


endchoice



config PQ2ADS

	bool

	depends on ADS8272

	default y



config ADS8272

	bool



config 8260

	bool "CPM2 Support" if WILLOW

	depends on 6xx

	default y if PQ2FADS

	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

	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 || MPC8555

	default y

	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).

endmenu

arch/powerpc/platforms/Kconfig

0 → 100644
+219 −0
Original line number Diff line number Diff line 
menu "Platform support"

	depends on PPC64 || CLASSIC32



choice

	prompt "Machine type"

	default PPC_MULTIPLATFORM



config PPC_MULTIPLATFORM

	bool "Generic desktop/server/laptop"

	help

	  Select this option if configuring for an IBM pSeries or

	  RS/6000 machine, an Apple machine, or a PReP, CHRP,

	  Maple or Cell-based machine.



config EMBEDDED6xx

	bool "Embedded 6xx/7xx/7xxx-based board"

	depends on PPC32 && (BROKEN||BROKEN_ON_SMP)



config APUS

	bool "Amiga-APUS"

	depends on PPC32 && BROKEN

	help

	  Select APUS if configuring for a PowerUP Amiga.

	  More information is available at:

	  <http://linux-apus.sourceforge.net/>.

endchoice



config QUICC_ENGINE

	bool

	depends on PPC_MPC836x || PPC_MPC832x

	default y

	help

	  The QUICC Engine (QE) is a new generation of communications

	  coprocessors on Freescale embedded CPUs (akin to CPM in older chips).

	  Selecting this option means that you wish to build a kernel

	  for a machine with a QE coprocessor.



source "arch/powerpc/platforms/pseries/Kconfig"

source "arch/powerpc/platforms/iseries/Kconfig"

source "arch/powerpc/platforms/chrp/Kconfig"

source "arch/powerpc/platforms/52xx/Kconfig"

source "arch/powerpc/platforms/powermac/Kconfig"

source "arch/powerpc/platforms/prep/Kconfig"

source "arch/powerpc/platforms/maple/Kconfig"

source "arch/powerpc/platforms/pasemi/Kconfig"

source arch/powerpc/platforms/celleb/Kconfig

source arch/powerpc/platforms/ps3/Kconfig

source arch/powerpc/platforms/cell/Kconfig



config PPC_NATIVE

	bool

	depends on PPC_MULTIPLATFORM

	help

	  Support for running natively on the hardware, i.e. without

	  a hypervisor. This option is not user-selectable but should

	  be selected by all platforms that need it.



config UDBG_RTAS_CONSOLE

	bool "RTAS based debug console"

	depends on PPC_RTAS

	default n



config PPC_UDBG_BEAT

	bool "BEAT based debug console"

	depends on PPC_CELLEB

	default n



config XICS

	depends on PPC_PSERIES

	bool

	default y



config U3_DART

	bool

	depends on PPC_MULTIPLATFORM && PPC64

	default n



config PPC_RTAS

	bool

	default n



config RTAS_ERROR_LOGGING

	bool

	depends on PPC_RTAS

	default n



config RTAS_PROC

	bool "Proc interface to RTAS"

	depends on PPC_RTAS

	default y



config RTAS_FLASH

	tristate "Firmware flash interface"

	depends on PPC64 && RTAS_PROC



config PPC_PMI

	tristate "Support for PMI"

	depends PPC_IBM_CELL_BLADE

	help

	  PMI (Platform Management Interrupt) is a way to

	  communicate with the BMC (Baseboard Mangement Controller).

	  It is used in some IBM Cell blades.

	default m



config MMIO_NVRAM

	bool

	default n



config MPIC_BROKEN_U3

	bool

	depends on PPC_MAPLE

	default y



config IBMVIO

	depends on PPC_PSERIES || PPC_ISERIES

	bool

	default y



config IBMEBUS

	depends on PPC_PSERIES

	bool "Support for GX bus based adapters"

	help

	  Bus device driver for GX bus based adapters.



config PPC_MPC106

	bool

	default n



config PPC_970_NAP

	bool

	default n



config PPC_INDIRECT_IO

	bool

	select GENERIC_IOMAP

	default n



config GENERIC_IOMAP

	bool

	default n



source "drivers/cpufreq/Kconfig"



config CPU_FREQ_PMAC

	bool "Support for Apple PowerBooks"

	depends on CPU_FREQ && ADB_PMU && PPC32

	select CPU_FREQ_TABLE

	help

	  This adds support for frequency switching on Apple PowerBooks,

	  this currently includes some models of iBook & Titanium

	  PowerBook.



config CPU_FREQ_PMAC64

	bool "Support for some Apple G5s"

	depends on CPU_FREQ && PPC64

	select CPU_FREQ_TABLE

	help

	  This adds support for frequency switching on Apple iMac G5,

	  and some of the more recent desktop G5 machines as well.



config PPC601_SYNC_FIX

	bool "Workarounds for PPC601 bugs"

	depends on 6xx && (PPC_PREP || PPC_PMAC)

	help

	  Some versions of the PPC601 (the first PowerPC chip) have bugs which

	  mean that extra synchronization instructions are required near

	  certain instructions, typically those that make major changes to the

	  CPU state.  These extra instructions reduce performance slightly.

	  If you say N here, these extra instructions will not be included,

	  resulting in a kernel which will run faster but may not run at all

	  on some systems with the PPC601 chip.



	  If in doubt, say Y here.



config TAU

	bool "On-chip CPU temperature sensor support"

	depends on 6xx

	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

	  temperature within 2-4 degrees Celsius. This option shows the current

	  on-die temperature in /proc/cpuinfo if the cpu supports it.



	  Unfortunately, on some chip revisions, this sensor is very inaccurate

	  and in many cases, does not work at all, so don't assume the cpu

	  temp is actually what /proc/cpuinfo says it is.



config TAU_INT

	bool "Interrupt driven TAU driver (DANGEROUS)"

	depends on TAU

	---help---

	  The TAU supports an interrupt driven mode which causes an interrupt

	  whenever the temperature goes out of range. This is the fastest way

	  to get notified the temp has exceeded a range. With this option off,

	  a timer is used to re-check the temperature periodically.



	  However, on some cpus it appears that the TAU interrupt hardware

	  is buggy and can cause a situation which would lead unexplained hard

	  lockups.



	  Unless you are extending the TAU driver, or enjoy kernel/hardware

	  debugging, leave this option off.



config TAU_AVERAGE

	bool "Average high and low temp"

	depends on TAU

	---help---

	  The TAU hardware can compare the temperature to an upper and lower

	  bound.  The default behavior is to show both the upper and lower

	  bound in /proc/cpuinfo. If the range is large, the temperature is

	  either changing a lot, or the TAU hardware is broken (likely on some

	  G4's). If the range is small (around 4 degrees), the temperature is

	  relatively stable.  If you say Y here, a single temperature value,

	  halfway between the upper and lower bounds, will be reported in

	  /proc/cpuinfo.



	  If in doubt, say N here.



endmenu