diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/Kconfig | 83 | ||||
-rw-r--r-- | arch/powerpc/platforms/83xx/Kconfig | 26 | ||||
-rw-r--r-- | arch/powerpc/platforms/83xx/Makefile | 4 | ||||
-rw-r--r-- | arch/powerpc/platforms/Makefile | 1 | ||||
-rw-r--r-- | arch/powerpc/platforms/embedded6xx/Kconfig | 18 | ||||
-rw-r--r-- | arch/powerpc/sysdev/Makefile | 2 | ||||
-rw-r--r-- | arch/ppc/Kconfig | 4 |
7 files changed, 85 insertions, 53 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 935d96571515..01feed0e2a15 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
@@ -71,15 +71,39 @@ config ARCH_MAY_HAVE_PC_FDC | |||
71 | bool | 71 | bool |
72 | default y | 72 | default y |
73 | 73 | ||
74 | config PPC_OF | ||
75 | def_bool y | ||
76 | |||
77 | config PPC_UDBG_16550 | ||
78 | bool | ||
79 | default n | ||
80 | |||
81 | config CRASH_DUMP | ||
82 | bool "kernel crash dumps (EXPERIMENTAL)" | ||
83 | depends on PPC_MULTIPLATFORM | ||
84 | depends on EXPERIMENTAL | ||
85 | help | ||
86 | Build a kernel suitable for use as a kdump capture kernel. | ||
87 | The kernel will be linked at a different address than normal, and | ||
88 | so can only be used for Kdump. | ||
89 | |||
90 | Don't change this unless you know what you are doing. | ||
91 | |||
92 | config GENERIC_TBSYNC | ||
93 | bool | ||
94 | default y if PPC32 && SMP | ||
95 | default n | ||
96 | |||
74 | menu "Processor support" | 97 | menu "Processor support" |
75 | choice | 98 | choice |
76 | prompt "Processor Type" | 99 | prompt "Processor Type" |
77 | depends on PPC32 | 100 | depends on PPC32 |
78 | default 6xx | 101 | default 6xx |
79 | 102 | ||
80 | config 6xx | 103 | config CLASSIC32 |
81 | bool "6xx/7xx/74xx" | 104 | bool "6xx/7xx/74xx" |
82 | select PPC_FPU | 105 | select PPC_FPU |
106 | select 6xx | ||
83 | help | 107 | help |
84 | There are four families of PowerPC chips supported. The more common | 108 | There are four families of PowerPC chips supported. The more common |
85 | types (601, 603, 604, 740, 750, 7400), the Motorola embedded | 109 | types (601, 603, 604, 740, 750, 7400), the Motorola embedded |
@@ -93,12 +117,20 @@ config 6xx | |||
93 | 117 | ||
94 | config PPC_52xx | 118 | config PPC_52xx |
95 | bool "Freescale 52xx" | 119 | bool "Freescale 52xx" |
120 | select 6xx | ||
121 | select PPC_FPU | ||
96 | 122 | ||
97 | config PPC_82xx | 123 | config PPC_82xx |
98 | bool "Freescale 82xx" | 124 | bool "Freescale 82xx" |
125 | select 6xx | ||
126 | select PPC_FPU | ||
99 | 127 | ||
100 | config PPC_83xx | 128 | config PPC_83xx |
101 | bool "Freescale 83xx" | 129 | bool "Freescale 83xx" |
130 | select 6xx | ||
131 | select FSL_SOC | ||
132 | select 83xx | ||
133 | select PPC_FPU | ||
102 | 134 | ||
103 | config 40x | 135 | config 40x |
104 | bool "AMCC 40x" | 136 | bool "AMCC 40x" |
@@ -134,6 +166,13 @@ config POWER4 | |||
134 | depends on PPC64 | 166 | depends on PPC64 |
135 | def_bool y | 167 | def_bool y |
136 | 168 | ||
169 | config 6xx | ||
170 | bool | ||
171 | |||
172 | # this is temp to handle compat with arch=ppc | ||
173 | config 83xx | ||
174 | bool | ||
175 | |||
137 | config PPC_FPU | 176 | config PPC_FPU |
138 | bool | 177 | bool |
139 | default y if PPC64 | 178 | default y if PPC64 |
@@ -166,7 +205,7 @@ config PHYS_64BIT | |||
166 | 205 | ||
167 | config ALTIVEC | 206 | config ALTIVEC |
168 | bool "AltiVec Support" | 207 | bool "AltiVec Support" |
169 | depends on 6xx || POWER4 | 208 | depends on CLASSIC32 || POWER4 |
170 | ---help--- | 209 | ---help--- |
171 | This option enables kernel support for the Altivec extensions to the | 210 | This option enables kernel support for the Altivec extensions to the |
172 | PowerPC processor. The kernel currently supports saving and restoring | 211 | PowerPC processor. The kernel currently supports saving and restoring |
@@ -239,7 +278,7 @@ endmenu | |||
239 | source "init/Kconfig" | 278 | source "init/Kconfig" |
240 | 279 | ||
241 | menu "Platform support" | 280 | menu "Platform support" |
242 | depends on PPC64 || 6xx | 281 | depends on PPC64 || CLASSIC32 |
243 | 282 | ||
244 | choice | 283 | choice |
245 | prompt "Machine type" | 284 | prompt "Machine type" |
@@ -330,9 +369,6 @@ config PPC_CELL | |||
330 | select MMIO_NVRAM | 369 | select MMIO_NVRAM |
331 | select PPC_UDBG_16550 | 370 | select PPC_UDBG_16550 |
332 | 371 | ||
333 | config PPC_OF | ||
334 | def_bool y | ||
335 | |||
336 | config XICS | 372 | config XICS |
337 | depends on PPC_PSERIES | 373 | depends on PPC_PSERIES |
338 | bool | 374 | bool |
@@ -375,26 +411,11 @@ config MPIC_BROKEN_U3 | |||
375 | depends on PPC_MAPLE | 411 | depends on PPC_MAPLE |
376 | default y | 412 | default y |
377 | 413 | ||
378 | config PPC_UDBG_16550 | ||
379 | bool | ||
380 | default n | ||
381 | |||
382 | config CELL_IIC | 414 | config CELL_IIC |
383 | depends on PPC_CELL | 415 | depends on PPC_CELL |
384 | bool | 416 | bool |
385 | default y | 417 | default y |
386 | 418 | ||
387 | config CRASH_DUMP | ||
388 | bool "kernel crash dumps (EXPERIMENTAL)" | ||
389 | depends on PPC_MULTIPLATFORM | ||
390 | depends on EXPERIMENTAL | ||
391 | help | ||
392 | Build a kernel suitable for use as a kdump capture kernel. | ||
393 | The kernel will be linked at a different address than normal, and | ||
394 | so can only be used for Kdump. | ||
395 | |||
396 | Don't change this unless you know what you are doing. | ||
397 | |||
398 | config IBMVIO | 419 | config IBMVIO |
399 | depends on PPC_PSERIES || PPC_ISERIES | 420 | depends on PPC_PSERIES || PPC_ISERIES |
400 | bool | 421 | bool |
@@ -410,11 +431,6 @@ config PPC_MPC106 | |||
410 | bool | 431 | bool |
411 | default n | 432 | default n |
412 | 433 | ||
413 | config GENERIC_TBSYNC | ||
414 | bool | ||
415 | default y if PPC32 && SMP | ||
416 | default n | ||
417 | |||
418 | source "drivers/cpufreq/Kconfig" | 434 | source "drivers/cpufreq/Kconfig" |
419 | 435 | ||
420 | config CPU_FREQ_PMAC | 436 | config CPU_FREQ_PMAC |
@@ -495,6 +511,7 @@ endmenu | |||
495 | 511 | ||
496 | source arch/powerpc/platforms/embedded6xx/Kconfig | 512 | source arch/powerpc/platforms/embedded6xx/Kconfig |
497 | source arch/powerpc/platforms/4xx/Kconfig | 513 | source arch/powerpc/platforms/4xx/Kconfig |
514 | source arch/powerpc/platforms/83xx/Kconfig | ||
498 | source arch/powerpc/platforms/85xx/Kconfig | 515 | source arch/powerpc/platforms/85xx/Kconfig |
499 | source arch/powerpc/platforms/8xx/Kconfig | 516 | source arch/powerpc/platforms/8xx/Kconfig |
500 | source arch/powerpc/platforms/cell/Kconfig | 517 | source arch/powerpc/platforms/cell/Kconfig |
@@ -718,7 +735,7 @@ config PPC_I8259 | |||
718 | config PPC_INDIRECT_PCI | 735 | config PPC_INDIRECT_PCI |
719 | bool | 736 | bool |
720 | depends on PCI | 737 | depends on PCI |
721 | default y if 40x || 44x || 85xx || 83xx | 738 | default y if 40x || 44x || 85xx |
722 | default n | 739 | default n |
723 | 740 | ||
724 | config EISA | 741 | config EISA |
@@ -727,13 +744,16 @@ config EISA | |||
727 | config SBUS | 744 | config SBUS |
728 | bool | 745 | bool |
729 | 746 | ||
747 | config FSL_SOC | ||
748 | bool | ||
749 | |||
730 | # Yes MCA RS/6000s exist but Linux-PPC does not currently support any | 750 | # Yes MCA RS/6000s exist but Linux-PPC does not currently support any |
731 | config MCA | 751 | config MCA |
732 | bool | 752 | bool |
733 | 753 | ||
734 | config PCI | 754 | config PCI |
735 | bool "PCI support" if 40x || CPM2 || 83xx || 85xx || PPC_MPC52xx || (EMBEDDED && PPC_ISERIES) | 755 | bool "PCI support" if 40x || CPM2 || PPC_83xx || 85xx || PPC_MPC52xx || (EMBEDDED && PPC_ISERIES) |
736 | default y if !40x && !CPM2 && !8xx && !APUS && !83xx && !85xx | 756 | default y if !40x && !CPM2 && !8xx && !APUS && !PPC_83xx && !85xx |
737 | default PCI_PERMEDIA if !4xx && !CPM2 && !8xx && APUS | 757 | default PCI_PERMEDIA if !4xx && !CPM2 && !8xx && APUS |
738 | default PCI_QSPAN if !4xx && !CPM2 && 8xx | 758 | default PCI_QSPAN if !4xx && !CPM2 && 8xx |
739 | help | 759 | help |
@@ -746,11 +766,6 @@ config PCI_DOMAINS | |||
746 | bool | 766 | bool |
747 | default PCI | 767 | default PCI |
748 | 768 | ||
749 | config MPC83xx_PCI2 | ||
750 | bool " Supprt for 2nd PCI host controller" | ||
751 | depends on PCI && MPC834x | ||
752 | default y if MPC834x_SYS | ||
753 | |||
754 | config PCI_QSPAN | 769 | config PCI_QSPAN |
755 | bool "QSpan PCI" | 770 | bool "QSpan PCI" |
756 | depends on !4xx && !CPM2 && 8xx | 771 | depends on !4xx && !CPM2 && 8xx |
diff --git a/arch/powerpc/platforms/83xx/Kconfig b/arch/powerpc/platforms/83xx/Kconfig new file mode 100644 index 000000000000..b20812d460e6 --- /dev/null +++ b/arch/powerpc/platforms/83xx/Kconfig | |||
@@ -0,0 +1,26 @@ | |||
1 | menu "Platform support" | ||
2 | depends on PPC_83xx | ||
3 | |||
4 | choice | ||
5 | prompt "Machine Type" | ||
6 | default MPC834x_SYS | ||
7 | |||
8 | config MPC834x_SYS | ||
9 | bool "Freescale MPC834x SYS" | ||
10 | help | ||
11 | This option enables support for the MPC 834x SYS evaluation board. | ||
12 | |||
13 | Be aware that PCI buses can only function when SYS board is plugged | ||
14 | into the PIB (Platform IO Board) board from Freescale which provide | ||
15 | 3 PCI slots. The PIBs PCI initialization is the bootloader's | ||
16 | responsiblilty. | ||
17 | |||
18 | endchoice | ||
19 | |||
20 | config MPC834x | ||
21 | bool | ||
22 | select PPC_UDBG_16550 | ||
23 | select PPC_INDIRECT_PCI | ||
24 | default y if MPC834x_SYS | ||
25 | |||
26 | endmenu | ||
diff --git a/arch/powerpc/platforms/83xx/Makefile b/arch/powerpc/platforms/83xx/Makefile new file mode 100644 index 000000000000..9d8b28ef3343 --- /dev/null +++ b/arch/powerpc/platforms/83xx/Makefile | |||
@@ -0,0 +1,4 @@ | |||
1 | # | ||
2 | # Makefile for the PowerPC 83xx linux kernel. | ||
3 | # | ||
4 | obj-$(CONFIG_MPC834x_SYS) += mpc834x_sys.o pci.o | ||
diff --git a/arch/powerpc/platforms/Makefile b/arch/powerpc/platforms/Makefile index 8836b3a00668..04073fd987ec 100644 --- a/arch/powerpc/platforms/Makefile +++ b/arch/powerpc/platforms/Makefile | |||
@@ -7,6 +7,7 @@ endif | |||
7 | endif | 7 | endif |
8 | obj-$(CONFIG_PPC_CHRP) += chrp/ | 8 | obj-$(CONFIG_PPC_CHRP) += chrp/ |
9 | obj-$(CONFIG_4xx) += 4xx/ | 9 | obj-$(CONFIG_4xx) += 4xx/ |
10 | obj-$(CONFIG_PPC_83xx) += 83xx/ | ||
10 | obj-$(CONFIG_85xx) += 85xx/ | 11 | obj-$(CONFIG_85xx) += 85xx/ |
11 | obj-$(CONFIG_PPC_PSERIES) += pseries/ | 12 | obj-$(CONFIG_PPC_PSERIES) += pseries/ |
12 | obj-$(CONFIG_PPC_ISERIES) += iseries/ | 13 | obj-$(CONFIG_PPC_ISERIES) += iseries/ |
diff --git a/arch/powerpc/platforms/embedded6xx/Kconfig b/arch/powerpc/platforms/embedded6xx/Kconfig index 81250090f98d..4fdbc9ae876b 100644 --- a/arch/powerpc/platforms/embedded6xx/Kconfig +++ b/arch/powerpc/platforms/embedded6xx/Kconfig | |||
@@ -144,16 +144,6 @@ config LITE5200 | |||
144 | much but it's only been tested on this board version. I think this | 144 | much but it's only been tested on this board version. I think this |
145 | board is also known as IceCube. | 145 | board is also known as IceCube. |
146 | 146 | ||
147 | config MPC834x_SYS | ||
148 | bool "Freescale MPC834x SYS" | ||
149 | help | ||
150 | This option enables support for the MPC 834x SYS evaluation board. | ||
151 | |||
152 | Be aware that PCI buses can only function when SYS board is plugged | ||
153 | into the PIB (Platform IO Board) board from Freescale which provide | ||
154 | 3 PCI slots. The PIBs PCI initialization is the bootloader's | ||
155 | responsiblilty. | ||
156 | |||
157 | config EV64360 | 147 | config EV64360 |
158 | bool "Marvell-EV64360BP" | 148 | bool "Marvell-EV64360BP" |
159 | help | 149 | help |
@@ -192,14 +182,6 @@ config 8272 | |||
192 | The MPC8272 CPM has a different internal dpram setup than other CPM2 | 182 | The MPC8272 CPM has a different internal dpram setup than other CPM2 |
193 | devices | 183 | devices |
194 | 184 | ||
195 | config 83xx | ||
196 | bool | ||
197 | default y if MPC834x_SYS | ||
198 | |||
199 | config MPC834x | ||
200 | bool | ||
201 | default y if MPC834x_SYS | ||
202 | |||
203 | config CPM2 | 185 | config CPM2 |
204 | bool | 186 | bool |
205 | depends on 8260 || MPC8560 || MPC8555 | 187 | depends on 8260 || MPC8560 || MPC8555 |
diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile index 14b9abde2d27..0ae841347a09 100644 --- a/arch/powerpc/sysdev/Makefile +++ b/arch/powerpc/sysdev/Makefile | |||
@@ -6,4 +6,4 @@ obj-$(CONFIG_BOOKE) += dcr.o | |||
6 | obj-$(CONFIG_40x) += dcr.o | 6 | obj-$(CONFIG_40x) += dcr.o |
7 | obj-$(CONFIG_U3_DART) += dart_iommu.o | 7 | obj-$(CONFIG_U3_DART) += dart_iommu.o |
8 | obj-$(CONFIG_MMIO_NVRAM) += mmio_nvram.o | 8 | obj-$(CONFIG_MMIO_NVRAM) += mmio_nvram.o |
9 | obj-$(CONFIG_83xx) += ipic.o | 9 | obj-$(CONFIG_PPC_83xx) += ipic.o |
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig index e396f4591d59..d65810108bc3 100644 --- a/arch/ppc/Kconfig +++ b/arch/ppc/Kconfig | |||
@@ -743,6 +743,10 @@ config MPC834x | |||
743 | bool | 743 | bool |
744 | default y if MPC834x_SYS | 744 | default y if MPC834x_SYS |
745 | 745 | ||
746 | config PPC_83xx | ||
747 | bool | ||
748 | default y if 83xx | ||
749 | |||
746 | config CPM1 | 750 | config CPM1 |
747 | bool | 751 | bool |
748 | depends on 8xx | 752 | depends on 8xx |