aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/Kconfig47
-rw-r--r--arch/powerpc/platforms/82xx/Kconfig50
-rw-r--r--arch/powerpc/platforms/83xx/Kconfig6
-rw-r--r--arch/powerpc/platforms/85xx/Kconfig29
-rw-r--r--arch/powerpc/platforms/86xx/Kconfig18
-rw-r--r--arch/powerpc/platforms/8xx/Kconfig67
-rw-r--r--arch/powerpc/platforms/Kconfig58
7 files changed, 109 insertions, 166 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 740892a13c76..26713da1b524 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -192,7 +192,6 @@ config 44x
192 bool "AMCC 44x" 192 bool "AMCC 44x"
193 select PPC_DCR_NATIVE 193 select PPC_DCR_NATIVE
194 194
195
196config E200 195config E200
197 bool "Freescale e200" 196 bool "Freescale e200"
198 197
@@ -375,14 +374,6 @@ source "init/Kconfig"
375 374
376source "arch/powerpc/platforms/Kconfig" 375source "arch/powerpc/platforms/Kconfig"
377 376
378source arch/powerpc/platforms/embedded6xx/Kconfig
379source arch/powerpc/platforms/4xx/Kconfig
380source arch/powerpc/platforms/82xx/Kconfig
381source arch/powerpc/platforms/83xx/Kconfig
382source arch/powerpc/platforms/85xx/Kconfig
383source arch/powerpc/platforms/86xx/Kconfig
384source arch/powerpc/platforms/8xx/Kconfig
385
386menu "Kernel options" 377menu "Kernel options"
387 378
388config HIGHMEM 379config HIGHMEM
@@ -464,15 +455,6 @@ config CRASH_DUMP
464 455
465 Don't change this unless you know what you are doing. 456 Don't change this unless you know what you are doing.
466 457
467config EMBEDDEDBOOT
468 bool
469 depends on 8xx || 8260
470 default y
471
472config PC_KEYBOARD
473 bool "PC PS/2 style Keyboard"
474 depends on 4xx || CPM2
475
476config PPCBUG_NVRAM 458config PPCBUG_NVRAM
477 bool "Enable reading PPCBUG NVRAM during boot" if PPLUS || LOPEC 459 bool "Enable reading PPCBUG NVRAM during boot" if PPLUS || LOPEC
478 default y if PPC_PREP 460 default y if PPC_PREP
@@ -486,7 +468,6 @@ config IRQ_ALL_CPUS
486 CPU. Generally saying Y is safe, although some problems have been 468 CPU. Generally saying Y is safe, although some problems have been
487 reported with SMP Power Macintoshes with this option enabled. 469 reported with SMP Power Macintoshes with this option enabled.
488 470
489
490config NUMA 471config NUMA
491 bool "NUMA support" 472 bool "NUMA support"
492 depends on PPC64 473 depends on PPC64
@@ -536,10 +517,10 @@ config PPC_64K_PAGES
536 depends on PPC64 517 depends on PPC64
537 help 518 help
538 This option changes the kernel logical page size to 64k. On machines 519 This option changes the kernel logical page size to 64k. On machines
539 without processor support for 64k pages, the kernel will simulate 520 without processor support for 64k pages, the kernel will simulate
540 them by loading each individual 4k page on demand transparently, 521 them by loading each individual 4k page on demand transparently,
541 while on hardware with such support, it will be used to map 522 while on hardware with such support, it will be used to map
542 normal application pages. 523 normal application pages.
543 524
544config SCHED_SMT 525config SCHED_SMT
545 bool "SMT (Hyperthreading) scheduler support" 526 bool "SMT (Hyperthreading) scheduler support"
@@ -619,24 +600,17 @@ config GENERIC_ISA_DMA
619 depends on PPC64 || POWER4 || 6xx && !CPM2 600 depends on PPC64 || POWER4 || 6xx && !CPM2
620 default y 601 default y
621 602
622config MPIC
623 bool
624 default n
625
626config MPIC_WEIRD
627 bool
628 default n
629
630config PPC_I8259
631 bool
632 default n
633
634config PPC_INDIRECT_PCI 603config PPC_INDIRECT_PCI
635 bool 604 bool
636 depends on PCI 605 depends on PCI
637 default y if 40x || 44x 606 default y if 40x || 44x
638 default n 607 default n
639 608
609config PPC_INDIRECT_PCI_BE
610 bool
611 depends PPC_INDIRECT_PCI
612 default n
613
640config EISA 614config EISA
641 bool 615 bool
642 616
@@ -857,11 +831,10 @@ source "fs/Kconfig"
857 831
858source "arch/powerpc/sysdev/qe_lib/Kconfig" 832source "arch/powerpc/sysdev/qe_lib/Kconfig"
859 833
860
861source "lib/Kconfig" 834source "lib/Kconfig"
862 835
863menu "Instrumentation Support" 836menu "Instrumentation Support"
864 depends on EXPERIMENTAL 837 depends on EXPERIMENTAL
865 838
866source "arch/powerpc/oprofile/Kconfig" 839source "arch/powerpc/oprofile/Kconfig"
867 840
diff --git a/arch/powerpc/platforms/82xx/Kconfig b/arch/powerpc/platforms/82xx/Kconfig
index 411071686f20..de7fce9cb6eb 100644
--- a/arch/powerpc/platforms/82xx/Kconfig
+++ b/arch/powerpc/platforms/82xx/Kconfig
@@ -1,56 +1,36 @@
1menu "Platform support"
2 depends on PPC_82xx
3
4choice 1choice
5 prompt "Machine Type" 2 prompt "Machine Type"
6 default MPC82xx_ADS 3 depends on PPC_82xx
4 default MPC82xx_ADS
7 5
8config MPC82xx_ADS 6config MPC82xx_ADS
9 bool "Freescale MPC82xx ADS" 7 bool "Freescale MPC82xx ADS"
10 select DEFAULT_UIMAGE 8 select DEFAULT_UIMAGE
11 select PQ2ADS 9 select PQ2ADS
12 select 8272 10 select 8272
13 select 8260 11 select 8260
14 select CPM2 12 select FSL_SOC
15 select FSL_SOC 13 help
16 help 14 This option enables support for the MPC8272 ADS board
17 This option enables support for the MPC8272 ADS board
18 15
19endchoice 16endchoice
20 17
21config PQ2ADS 18config PQ2ADS
22 bool 19 bool
23 depends on ADS8272 20 default n
24 default y
25
26config ADS8272
27 bool
28 21
29config 8260 22config 8260
30 bool "CPM2 Support" if WILLOW 23 bool
31 depends on 6xx 24 depends on 6xx
32 default y if PQ2FADS 25 select CPM2
33 help 26 help
34 The MPC8260 is a typical embedded CPU made by Motorola. Selecting 27 The MPC8260 is a typical embedded CPU made by Freescale. Selecting
35 this option means that you wish to build a kernel for a machine with 28 this option means that you wish to build a kernel for a machine with
36 an 8260 class CPU. 29 an 8260 class CPU.
37 30
38config 8272 31config 8272
39 bool 32 bool
40 depends on 6xx
41 default y if ADS8272
42 select 8260 33 select 8260
43 help 34 help
44 The MPC8272 CPM has a different internal dpram setup than other CPM2 35 The MPC8272 CPM has a different internal dpram setup than other CPM2
45 devices 36 devices
46
47config CPM2
48 bool
49 depends on 8260 || MPC8560 || MPC8555
50 default y
51 help
52 The CPM2 (Communications Processor Module) is a coprocessor on
53 embedded CPUs made by Motorola. Selecting this option means that
54 you wish to build a kernel for a machine with a CPM2 coprocessor
55 on it (826x, 827x, 8560).
56endmenu
diff --git a/arch/powerpc/platforms/83xx/Kconfig b/arch/powerpc/platforms/83xx/Kconfig
index 2a23392bb92e..19cafdf6df93 100644
--- a/arch/powerpc/platforms/83xx/Kconfig
+++ b/arch/powerpc/platforms/83xx/Kconfig
@@ -1,8 +1,6 @@
1menu "Platform support"
2 depends on PPC_83xx
3
4choice 1choice
5 prompt "Machine Type" 2 prompt "Machine Type"
3 depends on PPC_83xx
6 default MPC834x_MDS 4 default MPC834x_MDS
7 5
8config MPC8313_RDB 6config MPC8313_RDB
@@ -77,5 +75,3 @@ config PPC_MPC836x
77 select PPC_UDBG_16550 75 select PPC_UDBG_16550
78 select PPC_INDIRECT_PCI 76 select PPC_INDIRECT_PCI
79 default y if MPC836x_MDS 77 default y if MPC836x_MDS
80
81endmenu
diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
index 329fcd48669a..629926e01e90 100644
--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@ -1,8 +1,6 @@
1menu "Platform support"
2 depends on PPC_85xx
3
4choice 1choice
5 prompt "Machine Type" 2 prompt "Machine Type"
3 depends on PPC_85xx
6 default MPC8540_ADS 4 default MPC8540_ADS
7 5
8config MPC8540_ADS 6config MPC8540_ADS
@@ -46,34 +44,15 @@ config MPC8540
46 44
47config MPC8560 45config MPC8560
48 bool 46 bool
49 select PPC_INDIRECT_PCI 47 select CPM2
50 default y if MPC8560_ADS 48 default y if MPC8560_ADS
51 49
52config MPC85xx 50config MPC85xx
53 bool 51 bool
54 select PPC_UDBG_16550 52 select PPC_UDBG_16550
55 select PPC_INDIRECT_PCI 53 select PPC_INDIRECT_PCI
54 select PPC_INDIRECT_PCI_BE
55 select MPIC
56 select SERIAL_8250_SHARE_IRQ if SERIAL_8250 56 select SERIAL_8250_SHARE_IRQ if SERIAL_8250
57 default y if MPC8540_ADS || MPC85xx_CDS || MPC8560_ADS \ 57 default y if MPC8540_ADS || MPC85xx_CDS || MPC8560_ADS \
58 || MPC85xx_MDS || MPC8544_DS 58 || MPC85xx_MDS || MPC8544_DS
59
60config PPC_INDIRECT_PCI_BE
61 bool
62 depends on PPC_85xx
63 default y
64
65config MPIC
66 bool
67 default y
68
69config CPM2
70 bool
71 depends on MPC8560
72 default y
73 help
74 The CPM2 (Communications Processor Module) is a coprocessor on
75 embedded CPUs made by Motorola. Selecting this option means that
76 you wish to build a kernel for a machine with a CPM2 coprocessor
77 on it.
78
79endmenu
diff --git a/arch/powerpc/platforms/86xx/Kconfig b/arch/powerpc/platforms/86xx/Kconfig
index 0c70944d0e37..d1bcff500464 100644
--- a/arch/powerpc/platforms/86xx/Kconfig
+++ b/arch/powerpc/platforms/86xx/Kconfig
@@ -1,8 +1,6 @@
1menu "Platform Support"
2 depends on PPC_86xx
3
4choice 1choice
5 prompt "Machine Type" 2 prompt "Machine Type"
3 depends on PPC_86xx
6 default MPC8641_HPCN 4 default MPC8641_HPCN
7 5
8config MPC8641_HPCN 6config MPC8641_HPCN
@@ -14,20 +12,10 @@ config MPC8641_HPCN
14 12
15endchoice 13endchoice
16 14
17
18config MPC8641 15config MPC8641
19 bool 16 bool
20 select PPC_INDIRECT_PCI 17 select PPC_INDIRECT_PCI
18 select PPC_INDIRECT_PCI_BE
21 select PPC_UDBG_16550 19 select PPC_UDBG_16550
20 select MPIC
22 default y if MPC8641_HPCN 21 default y if MPC8641_HPCN
23
24config MPIC
25 bool
26 default y
27
28config PPC_INDIRECT_PCI_BE
29 bool
30 depends on PPC_86xx
31 default y
32
33endmenu
diff --git a/arch/powerpc/platforms/8xx/Kconfig b/arch/powerpc/platforms/8xx/Kconfig
index beea6834bb7e..39bb8c5ebe70 100644
--- a/arch/powerpc/platforms/8xx/Kconfig
+++ b/arch/powerpc/platforms/8xx/Kconfig
@@ -1,6 +1,3 @@
1menu "Platform support"
2 depends on PPC_8xx
3
4config FADS 1config FADS
5 bool 2 bool
6 3
@@ -9,6 +6,7 @@ config CPM1
9 6
10choice 7choice
11 prompt "8xx Machine Type" 8 prompt "8xx Machine Type"
9 depends on PPC_8xx
12 depends on 8xx 10 depends on 8xx
13 default MPC885ADS 11 default MPC885ADS
14 12
@@ -36,38 +34,36 @@ config MPC885ADS
36endchoice 34endchoice
37 35
38menu "Freescale Ethernet driver platform-specific options" 36menu "Freescale Ethernet driver platform-specific options"
39 depends on (FS_ENET && MPC885ADS) 37 depends on (FS_ENET && MPC885ADS)
40
41 config MPC8xx_SECOND_ETH
42 bool "Second Ethernet channel"
43 depends on MPC885ADS
44 default y
45 help
46 This enables support for second Ethernet on MPC885ADS and MPC86xADS boards.
47 The latter will use SCC1, for 885ADS you can select it below.
48
49 choice
50 prompt "Second Ethernet channel"
51 depends on MPC8xx_SECOND_ETH
52 default MPC8xx_SECOND_ETH_FEC2
53
54 config MPC8xx_SECOND_ETH_FEC2
55 bool "FEC2"
56 depends on MPC885ADS
57 help
58 Enable FEC2 to serve as 2-nd Ethernet channel. Note that SMC2
59 (often 2-nd UART) will not work if this is enabled.
60
61 config MPC8xx_SECOND_ETH_SCC3
62 bool "SCC3"
63 depends on MPC885ADS
64 help
65 Enable SCC3 to serve as 2-nd Ethernet channel. Note that SMC1
66 (often 1-nd UART) will not work if this is enabled.
67
68 endchoice
69 38
70endmenu 39 config MPC8xx_SECOND_ETH
40 bool "Second Ethernet channel"
41 depends on MPC885ADS
42 default y
43 help
44 This enables support for second Ethernet on MPC885ADS and MPC86xADS boards.
45 The latter will use SCC1, for 885ADS you can select it below.
46
47 choice
48 prompt "Second Ethernet channel"
49 depends on MPC8xx_SECOND_ETH
50 default MPC8xx_SECOND_ETH_FEC2
51
52 config MPC8xx_SECOND_ETH_FEC2
53 bool "FEC2"
54 depends on MPC885ADS
55 help
56 Enable FEC2 to serve as 2-nd Ethernet channel. Note that SMC2
57 (often 2-nd UART) will not work if this is enabled.
58
59 config MPC8xx_SECOND_ETH_SCC3
60 bool "SCC3"
61 depends on MPC885ADS
62 help
63 Enable SCC3 to serve as 2-nd Ethernet channel. Note that SMC1
64 (often 1-nd UART) will not work if this is enabled.
65
66 endchoice
71 67
72endmenu 68endmenu
73 69
@@ -98,7 +94,7 @@ config 8xx_CPU6
98 require workarounds for Linux (and most other OSes to work). If you 94 require workarounds for Linux (and most other OSes to work). If you
99 get a BUG() very early in boot, this might fix the problem. For 95 get a BUG() very early in boot, this might fix the problem. For
100 more details read the document entitled "MPC860 Family Device Errata 96 more details read the document entitled "MPC860 Family Device Errata
101 Reference" on Motorola's website. This option also incurs a 97 Reference" on Freescale's website. This option also incurs a
102 performance hit. 98 performance hit.
103 99
104 If in doubt, say N here. 100 If in doubt, say N here.
@@ -135,4 +131,3 @@ config UCODE_PATCH
135 depends on !NO_UCODE_PATCH 131 depends on !NO_UCODE_PATCH
136 132
137endmenu 133endmenu
138
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index 161ab797ad4c..86be82a4b9ef 100644
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -1,8 +1,8 @@
1menu "Platform support" 1menu "Platform support"
2 depends on PPC64 || CLASSIC32
3 2
4choice 3choice
5 prompt "Machine type" 4 prompt "Machine type"
5 depends on PPC64 || CLASSIC32
6 default PPC_MULTIPLATFORM 6 default PPC_MULTIPLATFORM
7 7
8config PPC_MULTIPLATFORM 8config PPC_MULTIPLATFORM
@@ -25,14 +25,6 @@ config APUS
25 <http://linux-apus.sourceforge.net/>. 25 <http://linux-apus.sourceforge.net/>.
26endchoice 26endchoice
27 27
28config QUICC_ENGINE
29 bool
30 help
31 The QUICC Engine (QE) is a new generation of communications
32 coprocessors on Freescale embedded CPUs (akin to CPM in older chips).
33 Selecting this option means that you wish to build a kernel
34 for a machine with a QE coprocessor.
35
36source "arch/powerpc/platforms/pseries/Kconfig" 28source "arch/powerpc/platforms/pseries/Kconfig"
37source "arch/powerpc/platforms/iseries/Kconfig" 29source "arch/powerpc/platforms/iseries/Kconfig"
38source "arch/powerpc/platforms/chrp/Kconfig" 30source "arch/powerpc/platforms/chrp/Kconfig"
@@ -41,9 +33,16 @@ source "arch/powerpc/platforms/powermac/Kconfig"
41source "arch/powerpc/platforms/prep/Kconfig" 33source "arch/powerpc/platforms/prep/Kconfig"
42source "arch/powerpc/platforms/maple/Kconfig" 34source "arch/powerpc/platforms/maple/Kconfig"
43source "arch/powerpc/platforms/pasemi/Kconfig" 35source "arch/powerpc/platforms/pasemi/Kconfig"
44source arch/powerpc/platforms/celleb/Kconfig 36source "arch/powerpc/platforms/celleb/Kconfig"
45source arch/powerpc/platforms/ps3/Kconfig 37source "arch/powerpc/platforms/ps3/Kconfig"
46source arch/powerpc/platforms/cell/Kconfig 38source "arch/powerpc/platforms/cell/Kconfig"
39source "arch/powerpc/platforms/8xx/Kconfig"
40source "arch/powerpc/platforms/82xx/Kconfig"
41source "arch/powerpc/platforms/83xx/Kconfig"
42source "arch/powerpc/platforms/85xx/Kconfig"
43source "arch/powerpc/platforms/86xx/Kconfig"
44source "arch/powerpc/platforms/embedded6xx/Kconfig"
45#source "arch/powerpc/platforms/4xx/Kconfig
47 46
48config PPC_NATIVE 47config PPC_NATIVE
49 bool 48 bool
@@ -68,6 +67,18 @@ config XICS
68 bool 67 bool
69 default y 68 default y
70 69
70config MPIC
71 bool
72 default n
73
74config MPIC_WEIRD
75 bool
76 default n
77
78config PPC_I8259
79 bool
80 default n
81
71config U3_DART 82config U3_DART
72 bool 83 bool
73 depends on PPC_MULTIPLATFORM && PPC64 84 depends on PPC_MULTIPLATFORM && PPC64
@@ -137,6 +148,9 @@ config GENERIC_IOMAP
137 bool 148 bool
138 default n 149 default n
139 150
151menu "CPU Frequency support"
152 depends on PPC64 || CLASSIC32
153
140source "drivers/cpufreq/Kconfig" 154source "drivers/cpufreq/Kconfig"
141 155
142config CPU_FREQ_PMAC 156config CPU_FREQ_PMAC
@@ -155,6 +169,7 @@ config CPU_FREQ_PMAC64
155 help 169 help
156 This adds support for frequency switching on Apple iMac G5, 170 This adds support for frequency switching on Apple iMac G5,
157 and some of the more recent desktop G5 machines as well. 171 and some of the more recent desktop G5 machines as well.
172endmenu
158 173
159config PPC601_SYNC_FIX 174config PPC601_SYNC_FIX
160 bool "Workarounds for PPC601 bugs" 175 bool "Workarounds for PPC601 bugs"
@@ -172,7 +187,7 @@ config PPC601_SYNC_FIX
172 187
173config TAU 188config TAU
174 bool "On-chip CPU temperature sensor support" 189 bool "On-chip CPU temperature sensor support"
175 depends on 6xx 190 depends on CLASSIC32
176 help 191 help
177 G3 and G4 processors have an on-chip temperature sensor called the 192 G3 and G4 processors have an on-chip temperature sensor called the
178 'Thermal Assist Unit (TAU)', which, in theory, can measure the on-die 193 'Thermal Assist Unit (TAU)', which, in theory, can measure the on-die
@@ -214,4 +229,21 @@ config TAU_AVERAGE
214 229
215 If in doubt, say N here. 230 If in doubt, say N here.
216 231
232config QUICC_ENGINE
233 bool
234 help
235 The QUICC Engine (QE) is a new generation of communications
236 coprocessors on Freescale embedded CPUs (akin to CPM in older chips).
237 Selecting this option means that you wish to build a kernel
238 for a machine with a QE coprocessor.
239
240config CPM2
241 bool
242 default n
243 help
244 The CPM2 (Communications Processor Module) is a coprocessor on
245 embedded CPUs made by Freescale. Selecting this option means that
246 you wish to build a kernel for a machine with a CPM2 coprocessor
247 on it (826x, 827x, 8560).
248
217endmenu 249endmenu