X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=arch%2Fppc%2FKconfig;h=da5c9e5fe6a1dd015b658d93f99801dcb86d39dc;hb=70790a4b5cd6c0291e5b1a2836e2832d46036ac6;hp=729f8b203e3e06ee74ec040eeef009066f67ef8f;hpb=413ba3004a4036bb5d6e52d2faa2b19cb13561dc;p=linux-2.6.git
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index 729f8b203..da5c9e5fe 100644
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -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: -
@@ -598,8 +598,16 @@ config TQM8260
End of Life: not yet :-)
URL:
+config ADS8272
+ bool "ADS8272"
+
endchoice
+config PQ2ADS
+ bool
+ depends on ADS8272
+ default y
+
config TQM8xxL
bool
depends on 8xx && (TQM823L || TQM850L || FPS850L || TQM855L || TQM860L || SM850)
@@ -611,14 +619,32 @@ config EMBEDDEDBOOT
default y
config 8260
- bool "MPC8260 CPM Support" if WILLOW
+ bool "CPM2 Support" if WILLOW
depends on 6xx
default y if TQM8260 || RPXSUPER || EST8260 || SBS8260 || SBC82xx
help
- 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.
+ 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
+ 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).
config PPC_CHRP
bool
@@ -679,6 +705,16 @@ config MPC10X_BRIDGE
depends on PCORE || POWERPMC250 || LOPEC || SANDPOINT
default y
+config FSL_OCP
+ bool
+ depends on MPC10X_BRIDGE
+ 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
@@ -701,11 +737,11 @@ config SPRUCE_BAUD_33M
config PC_KEYBOARD
bool "PC PS/2 style Keyboard"
- depends on 4xx || 8260
+ depends on 4xx || CPM2
config SERIAL_CONSOLE
bool
- depends on 8xx || 8260
+ depends on 8xx
default y
config SERIAL_CONSOLE_BAUD
@@ -986,7 +1022,7 @@ config ISA
config GENERIC_ISA_DMA
bool
- depends on POWER3 || POWER4 || 6xx && !8260
+ depends on POWER3 || POWER4 || 6xx && !CPM2
default y
config EISA
@@ -1003,10 +1039,10 @@ config MCA
bool
config PCI
- 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
+ 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
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
@@ -1019,11 +1055,39 @@ config PCI_DOMAINS
config PCI_QSPAN
bool "QSpan PCI"
- depends on !4xx && !8260 && 8xx
+ depends on !4xx && !CPM2 && 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
@@ -1183,6 +1247,7 @@ endmenu
source "lib/Kconfig"
+source "arch/ppc/oprofile/Kconfig"
menu "Kernel hacking"
@@ -1258,7 +1323,7 @@ endchoice
config KGDB_CONSOLE
bool "Enable serial console thru kgdb port"
- depends on KGDB && 8xx || 8260
+ depends on KGDB && 8xx || CPM2
help
If you enable this, all serial console messages will be sent
over the gdb stub.