aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2007-03-26 00:08:19 -0400
committerPaul Mackerras <paulus@samba.org>2007-03-26 00:08:19 -0400
commit3771f2d9a46ca3b57e473afe929196efad7f3aa6 (patch)
treeacc03ec60470b7c0987df05486f6af877e367be3
parent70b52b3869a31aab85241a1f998f9943a3905637 (diff)
parent4330f5da98eb91392c7a7b00c22a24c57079c0fc (diff)
Merge branch 'ppc_kconfig' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into for-2.6.22
-rw-r--r--arch/powerpc/Kconfig385
-rw-r--r--arch/powerpc/Kconfig.debug3
-rw-r--r--arch/powerpc/platforms/52xx/Kconfig35
-rw-r--r--arch/powerpc/platforms/82xx/Kconfig35
-rw-r--r--arch/powerpc/platforms/Kconfig219
-rw-r--r--arch/powerpc/platforms/cell/Kconfig23
-rw-r--r--arch/powerpc/platforms/celleb/Kconfig9
-rw-r--r--arch/powerpc/platforms/chrp/Kconfig11
-rw-r--r--arch/powerpc/platforms/embedded6xx/Kconfig264
-rw-r--r--arch/powerpc/platforms/iseries/Kconfig4
-rw-r--r--arch/powerpc/platforms/maple/Kconfig17
-rw-r--r--arch/powerpc/platforms/pasemi/Kconfig12
-rw-r--r--arch/powerpc/platforms/powermac/Kconfig20
-rw-r--r--arch/powerpc/platforms/prep/Kconfig9
-rw-r--r--arch/powerpc/platforms/ps3/Kconfig16
-rw-r--r--arch/powerpc/platforms/pseries/Kconfig10
16 files changed, 424 insertions, 648 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index ec092b7ea242..20a8fdcaacbf 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -372,383 +372,7 @@ endmenu
372 372
373source "init/Kconfig" 373source "init/Kconfig"
374 374
375menu "Platform support" 375source "arch/powerpc/platforms/Kconfig"
376 depends on PPC64 || CLASSIC32
377
378choice
379 prompt "Machine type"
380 default PPC_MULTIPLATFORM
381
382config PPC_MULTIPLATFORM
383 bool "Generic desktop/server/laptop"
384 help
385 Select this option if configuring for an IBM pSeries or
386 RS/6000 machine, an Apple machine, or a PReP, CHRP,
387 Maple or Cell-based machine.
388
389config EMBEDDED6xx
390 bool "Embedded 6xx/7xx/7xxx-based board"
391 depends on PPC32 && (BROKEN||BROKEN_ON_SMP)
392
393config APUS
394 bool "Amiga-APUS"
395 depends on PPC32 && BROKEN
396 help
397 Select APUS if configuring for a PowerUP Amiga.
398 More information is available at:
399 <http://linux-apus.sourceforge.net/>.
400endchoice
401
402config QUICC_ENGINE
403 bool
404 depends on PPC_MPC836x || PPC_MPC832x
405 default y
406 help
407 The QUICC Engine (QE) is a new generation of communications
408 coprocessors on Freescale embedded CPUs (akin to CPM in older chips).
409 Selecting this option means that you wish to build a kernel
410 for a machine with a QE coprocessor.
411
412config PPC_PSERIES
413 depends on PPC_MULTIPLATFORM && PPC64
414 bool "IBM pSeries & new (POWER5-based) iSeries"
415 select MPIC
416 select PPC_I8259
417 select PPC_RTAS
418 select RTAS_ERROR_LOGGING
419 select PPC_UDBG_16550
420 select PPC_NATIVE
421 default y
422
423config PPC_ISERIES
424 bool "IBM Legacy iSeries"
425 depends on PPC_MULTIPLATFORM && PPC64
426 select PPC_INDIRECT_IO
427
428config PPC_CHRP
429 bool "Common Hardware Reference Platform (CHRP) based machines"
430 depends on PPC_MULTIPLATFORM && PPC32
431 select MPIC
432 select PPC_I8259
433 select PPC_INDIRECT_PCI
434 select PPC_RTAS
435 select PPC_MPC106
436 select PPC_UDBG_16550
437 select PPC_NATIVE
438 default y
439
440config PPC_MPC52xx
441 bool
442 default n
443
444config PPC_MPC5200
445 bool
446 select PPC_MPC52xx
447 default n
448
449config PPC_MPC5200_BUGFIX
450 bool "MPC5200 (L25R) bugfix support"
451 depends on PPC_MPC5200
452 default n
453 help
454 Enable workarounds for original MPC5200 errata. This is not required
455 for MPC5200B based boards.
456
457 It is safe to say 'Y' here
458
459config PPC_EFIKA
460 bool "bPlan Efika 5k2. MPC5200B based computer"
461 depends on PPC_MULTIPLATFORM && PPC32
462 select PPC_RTAS
463 select RTAS_PROC
464 select PPC_MPC52xx
465 select PPC_NATIVE
466 default n
467
468config PPC_LITE5200
469 bool "Freescale Lite5200 Eval Board"
470 depends on PPC_MULTIPLATFORM && PPC32
471 select PPC_MPC5200
472 default n
473
474config PPC_PMAC
475 bool "Apple PowerMac based machines"
476 depends on PPC_MULTIPLATFORM
477 select MPIC
478 select PPC_INDIRECT_PCI if PPC32
479 select PPC_MPC106 if PPC32
480 select PPC_NATIVE
481 default y
482
483config PPC_PMAC64
484 bool
485 depends on PPC_PMAC && POWER4
486 select MPIC
487 select U3_DART
488 select MPIC_BROKEN_U3
489 select GENERIC_TBSYNC
490 select PPC_970_NAP
491 default y
492
493config PPC_PREP
494 bool "PowerPC Reference Platform (PReP) based machines"
495 depends on PPC_MULTIPLATFORM && PPC32 && BROKEN
496 select MPIC
497 select PPC_I8259
498 select PPC_INDIRECT_PCI
499 select PPC_UDBG_16550
500 select PPC_NATIVE
501 default n
502
503config PPC_MAPLE
504 depends on PPC_MULTIPLATFORM && PPC64
505 bool "Maple 970FX Evaluation Board"
506 select MPIC
507 select U3_DART
508 select MPIC_BROKEN_U3
509 select GENERIC_TBSYNC
510 select PPC_UDBG_16550
511 select PPC_970_NAP
512 select PPC_NATIVE
513 select PPC_RTAS
514 select MMIO_NVRAM
515 select ATA_NONSTANDARD if ATA
516 default n
517 help
518 This option enables support for the Maple 970FX Evaluation Board.
519 For more information, refer to <http://www.970eval.com>
520
521config PPC_PASEMI
522 depends on PPC_MULTIPLATFORM && PPC64
523 bool "PA Semi SoC-based platforms"
524 default n
525 select MPIC
526 select PPC_UDBG_16550
527 select GENERIC_TBSYNC
528 select PPC_NATIVE
529 help
530 This option enables support for PA Semi's PWRficient line
531 of SoC processors, including PA6T-1682M
532
533config PPC_CELL
534 bool
535 default n
536
537config PPC_CELL_NATIVE
538 bool
539 select PPC_CELL
540 select PPC_DCR_MMIO
541 select PPC_OF_PLATFORM_PCI
542 select PPC_INDIRECT_IO
543 select PPC_NATIVE
544 select MPIC
545 default n
546
547config PPC_IBM_CELL_BLADE
548 bool "IBM Cell Blade"
549 depends on PPC_MULTIPLATFORM && PPC64
550 select PPC_CELL_NATIVE
551 select PPC_RTAS
552 select MMIO_NVRAM
553 select PPC_UDBG_16550
554 select UDBG_RTAS_CONSOLE
555
556config PPC_PS3
557 bool "Sony PS3 (incomplete)"
558 depends on PPC_MULTIPLATFORM && PPC64
559 select PPC_CELL
560 select USB_ARCH_HAS_OHCI
561 select USB_OHCI_LITTLE_ENDIAN
562 select USB_OHCI_BIG_ENDIAN_MMIO
563 select USB_ARCH_HAS_EHCI
564 select USB_EHCI_BIG_ENDIAN_MMIO
565 help
566 This option enables support for the Sony PS3 game console
567 and other platforms using the PS3 hypervisor.
568 Support for this platform is not yet complete, so
569 enabling this will not result in a bootable kernel on a
570 PS3 system.
571
572config PPC_CELLEB
573 bool "Toshiba's Cell Reference Set 'Celleb' Architecture"
574 depends on PPC_MULTIPLATFORM && PPC64
575 select PPC_CELL
576 select PPC_OF_PLATFORM_PCI
577 select HAS_TXX9_SERIAL
578 select PPC_UDBG_BEAT
579 select USB_OHCI_BIG_ENDIAN_MMIO
580 select USB_EHCI_BIG_ENDIAN_MMIO
581
582config PPC_NATIVE
583 bool
584 depends on PPC_MULTIPLATFORM
585 help
586 Support for running natively on the hardware, i.e. without
587 a hypervisor. This option is not user-selectable but should
588 be selected by all platforms that need it.
589
590config UDBG_RTAS_CONSOLE
591 bool "RTAS based debug console"
592 depends on PPC_RTAS
593 default n
594
595config PPC_UDBG_BEAT
596 bool "BEAT based debug console"
597 depends on PPC_CELLEB
598 default n
599
600config XICS
601 depends on PPC_PSERIES
602 bool
603 default y
604
605config U3_DART
606 bool
607 depends on PPC_MULTIPLATFORM && PPC64
608 default n
609
610config PPC_RTAS
611 bool
612 default n
613
614config RTAS_ERROR_LOGGING
615 bool
616 depends on PPC_RTAS
617 default n
618
619config RTAS_PROC
620 bool "Proc interface to RTAS"
621 depends on PPC_RTAS
622 default y
623
624config RTAS_FLASH
625 tristate "Firmware flash interface"
626 depends on PPC64 && RTAS_PROC
627
628config PPC_PMI
629 tristate "Support for PMI"
630 depends PPC_IBM_CELL_BLADE
631 help
632 PMI (Platform Management Interrupt) is a way to
633 communicate with the BMC (Baseboard Mangement Controller).
634 It is used in some IBM Cell blades.
635 default m
636
637config MMIO_NVRAM
638 bool
639 default n
640
641config MPIC_BROKEN_U3
642 bool
643 depends on PPC_MAPLE
644 default y
645
646config IBMVIO
647 depends on PPC_PSERIES || PPC_ISERIES
648 bool
649 default y
650
651config IBMEBUS
652 depends on PPC_PSERIES
653 bool "Support for GX bus based adapters"
654 help
655 Bus device driver for GX bus based adapters.
656
657config PPC_MPC106
658 bool
659 default n
660
661config PPC_970_NAP
662 bool
663 default n
664
665config PPC_INDIRECT_IO
666 bool
667 select GENERIC_IOMAP
668 default n
669
670config GENERIC_IOMAP
671 bool
672 default n
673
674source "drivers/cpufreq/Kconfig"
675
676config CPU_FREQ_PMAC
677 bool "Support for Apple PowerBooks"
678 depends on CPU_FREQ && ADB_PMU && PPC32
679 select CPU_FREQ_TABLE
680 help
681 This adds support for frequency switching on Apple PowerBooks,
682 this currently includes some models of iBook & Titanium
683 PowerBook.
684
685config CPU_FREQ_PMAC64
686 bool "Support for some Apple G5s"
687 depends on CPU_FREQ && PPC64
688 select CPU_FREQ_TABLE
689 help
690 This adds support for frequency switching on Apple iMac G5,
691 and some of the more recent desktop G5 machines as well.
692
693config PPC601_SYNC_FIX
694 bool "Workarounds for PPC601 bugs"
695 depends on 6xx && (PPC_PREP || PPC_PMAC)
696 help
697 Some versions of the PPC601 (the first PowerPC chip) have bugs which
698 mean that extra synchronization instructions are required near
699 certain instructions, typically those that make major changes to the
700 CPU state. These extra instructions reduce performance slightly.
701 If you say N here, these extra instructions will not be included,
702 resulting in a kernel which will run faster but may not run at all
703 on some systems with the PPC601 chip.
704
705 If in doubt, say Y here.
706
707config TAU
708 bool "On-chip CPU temperature sensor support"
709 depends on 6xx
710 help
711 G3 and G4 processors have an on-chip temperature sensor called the
712 'Thermal Assist Unit (TAU)', which, in theory, can measure the on-die
713 temperature within 2-4 degrees Celsius. This option shows the current
714 on-die temperature in /proc/cpuinfo if the cpu supports it.
715
716 Unfortunately, on some chip revisions, this sensor is very inaccurate
717 and in many cases, does not work at all, so don't assume the cpu
718 temp is actually what /proc/cpuinfo says it is.
719
720config TAU_INT
721 bool "Interrupt driven TAU driver (DANGEROUS)"
722 depends on TAU
723 ---help---
724 The TAU supports an interrupt driven mode which causes an interrupt
725 whenever the temperature goes out of range. This is the fastest way
726 to get notified the temp has exceeded a range. With this option off,
727 a timer is used to re-check the temperature periodically.
728
729 However, on some cpus it appears that the TAU interrupt hardware
730 is buggy and can cause a situation which would lead unexplained hard
731 lockups.
732
733 Unless you are extending the TAU driver, or enjoy kernel/hardware
734 debugging, leave this option off.
735
736config TAU_AVERAGE
737 bool "Average high and low temp"
738 depends on TAU
739 ---help---
740 The TAU hardware can compare the temperature to an upper and lower
741 bound. The default behavior is to show both the upper and lower
742 bound in /proc/cpuinfo. If the range is large, the temperature is
743 either changing a lot, or the TAU hardware is broken (likely on some
744 G4's). If the range is small (around 4 degrees), the temperature is
745 relatively stable. If you say Y here, a single temperature value,
746 halfway between the upper and lower bounds, will be reported in
747 /proc/cpuinfo.
748
749 If in doubt, say N here.
750
751endmenu
752 376
753source arch/powerpc/platforms/embedded6xx/Kconfig 377source arch/powerpc/platforms/embedded6xx/Kconfig
754source arch/powerpc/platforms/4xx/Kconfig 378source arch/powerpc/platforms/4xx/Kconfig
@@ -757,9 +381,6 @@ source arch/powerpc/platforms/83xx/Kconfig
757source arch/powerpc/platforms/85xx/Kconfig 381source arch/powerpc/platforms/85xx/Kconfig
758source arch/powerpc/platforms/86xx/Kconfig 382source arch/powerpc/platforms/86xx/Kconfig
759source arch/powerpc/platforms/8xx/Kconfig 383source arch/powerpc/platforms/8xx/Kconfig
760source arch/powerpc/platforms/cell/Kconfig
761source arch/powerpc/platforms/ps3/Kconfig
762source arch/powerpc/platforms/pasemi/Kconfig
763 384
764menu "Kernel options" 385menu "Kernel options"
765 386
@@ -864,7 +485,6 @@ config IRQ_ALL_CPUS
864 CPU. Generally saying Y is safe, although some problems have been 485 CPU. Generally saying Y is safe, although some problems have been
865 reported with SMP Power Macintoshes with this option enabled. 486 reported with SMP Power Macintoshes with this option enabled.
866 487
867source "arch/powerpc/platforms/pseries/Kconfig"
868 488
869config NUMA 489config NUMA
870 bool "NUMA support" 490 bool "NUMA support"
@@ -936,8 +556,6 @@ config PROC_DEVICETREE
936 an image of the device tree that the kernel copies from Open 556 an image of the device tree that the kernel copies from Open
937 Firmware or other boot firmware. If unsure, say Y here. 557 Firmware or other boot firmware. If unsure, say Y here.
938 558
939source "arch/powerpc/platforms/prep/Kconfig"
940
941config CMDLINE_BOOL 559config CMDLINE_BOOL
942 bool "Default bootloader kernel arguments" 560 bool "Default bootloader kernel arguments"
943 561
@@ -1234,7 +852,6 @@ source "fs/Kconfig"
1234 852
1235source "arch/powerpc/sysdev/qe_lib/Kconfig" 853source "arch/powerpc/sysdev/qe_lib/Kconfig"
1236 854
1237source "arch/powerpc/platforms/iseries/Kconfig"
1238 855
1239source "lib/Kconfig" 856source "lib/Kconfig"
1240 857
diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug
index d39d13327e6d..50f48f0c5630 100644
--- a/arch/powerpc/Kconfig.debug
+++ b/arch/powerpc/Kconfig.debug
@@ -132,8 +132,7 @@ config BOOTX_TEXT
132 132
133config SERIAL_TEXT_DEBUG 133config SERIAL_TEXT_DEBUG
134 bool "Support for early boot texts over serial port" 134 bool "Support for early boot texts over serial port"
135 depends on 4xx || LOPEC || MV64X60 || PPLUS || PRPMC800 || \ 135 depends on 4xx
136 PPC_GEN550 || PPC_MPC52xx
137 136
138config PPC_EARLY_DEBUG 137config PPC_EARLY_DEBUG
139 bool "Early debugging (dangerous)" 138 bool "Early debugging (dangerous)"
diff --git a/arch/powerpc/platforms/52xx/Kconfig b/arch/powerpc/platforms/52xx/Kconfig
new file mode 100644
index 000000000000..bc4aa4a80a12
--- /dev/null
+++ b/arch/powerpc/platforms/52xx/Kconfig
@@ -0,0 +1,35 @@
1config PPC_MPC52xx
2 bool
3 default n
4
5config PPC_MPC5200
6 bool
7 select PPC_MPC52xx
8 default n
9
10config PPC_MPC5200_BUGFIX
11 bool "MPC5200 (L25R) bugfix support"
12 depends on PPC_MPC5200
13 default n
14 help
15 Enable workarounds for original MPC5200 errata. This is not required
16 for MPC5200B based boards.
17
18 It is safe to say 'Y' here
19
20config PPC_EFIKA
21 bool "bPlan Efika 5k2. MPC5200B based computer"
22 depends on PPC_MULTIPLATFORM && PPC32
23 select PPC_RTAS
24 select RTAS_PROC
25 select PPC_MPC52xx
26 select PPC_NATIVE
27 default n
28
29config PPC_LITE5200
30 bool "Freescale Lite5200 Eval Board"
31 depends on PPC_MULTIPLATFORM && PPC32
32 select PPC_MPC5200
33 default n
34
35
diff --git a/arch/powerpc/platforms/82xx/Kconfig b/arch/powerpc/platforms/82xx/Kconfig
index 47d841ecf2e2..411071686f20 100644
--- a/arch/powerpc/platforms/82xx/Kconfig
+++ b/arch/powerpc/platforms/82xx/Kconfig
@@ -18,4 +18,39 @@ config MPC82xx_ADS
18 18
19endchoice 19endchoice
20 20
21config PQ2ADS
22 bool
23 depends on ADS8272
24 default y
25
26config ADS8272
27 bool
28
29config 8260
30 bool "CPM2 Support" if WILLOW
31 depends on 6xx
32 default y if PQ2FADS
33 help
34 The MPC8260 is a typical embedded CPU made by Motorola. Selecting
35 this option means that you wish to build a kernel for a machine with
36 an 8260 class CPU.
37
38config 8272
39 bool
40 depends on 6xx
41 default y if ADS8272
42 select 8260
43 help
44 The MPC8272 CPM has a different internal dpram setup than other CPM2
45 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).
21endmenu 56endmenu
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
new file mode 100644
index 000000000000..388a1bdd28e0
--- /dev/null
+++ b/arch/powerpc/platforms/Kconfig
@@ -0,0 +1,219 @@
1menu "Platform support"
2 depends on PPC64 || CLASSIC32
3
4choice
5 prompt "Machine type"
6 default PPC_MULTIPLATFORM
7
8config PPC_MULTIPLATFORM
9 bool "Generic desktop/server/laptop"
10 help
11 Select this option if configuring for an IBM pSeries or
12 RS/6000 machine, an Apple machine, or a PReP, CHRP,
13 Maple or Cell-based machine.
14
15config EMBEDDED6xx
16 bool "Embedded 6xx/7xx/7xxx-based board"
17 depends on PPC32 && (BROKEN||BROKEN_ON_SMP)
18
19config APUS
20 bool "Amiga-APUS"
21 depends on PPC32 && BROKEN
22 help
23 Select APUS if configuring for a PowerUP Amiga.
24 More information is available at:
25 <http://linux-apus.sourceforge.net/>.
26endchoice
27
28config QUICC_ENGINE
29 bool
30 depends on PPC_MPC836x || PPC_MPC832x
31 default y
32 help
33 The QUICC Engine (QE) is a new generation of communications
34 coprocessors on Freescale embedded CPUs (akin to CPM in older chips).
35 Selecting this option means that you wish to build a kernel
36 for a machine with a QE coprocessor.
37
38source "arch/powerpc/platforms/pseries/Kconfig"
39source "arch/powerpc/platforms/iseries/Kconfig"
40source "arch/powerpc/platforms/chrp/Kconfig"
41source "arch/powerpc/platforms/52xx/Kconfig"
42source "arch/powerpc/platforms/powermac/Kconfig"
43source "arch/powerpc/platforms/prep/Kconfig"
44source "arch/powerpc/platforms/maple/Kconfig"
45source "arch/powerpc/platforms/pasemi/Kconfig"
46source arch/powerpc/platforms/celleb/Kconfig
47source arch/powerpc/platforms/ps3/Kconfig
48source arch/powerpc/platforms/cell/Kconfig
49
50config PPC_NATIVE
51 bool
52 depends on PPC_MULTIPLATFORM
53 help
54 Support for running natively on the hardware, i.e. without
55 a hypervisor. This option is not user-selectable but should
56 be selected by all platforms that need it.
57
58config UDBG_RTAS_CONSOLE
59 bool "RTAS based debug console"
60 depends on PPC_RTAS
61 default n
62
63config PPC_UDBG_BEAT
64 bool "BEAT based debug console"
65 depends on PPC_CELLEB
66 default n
67
68config XICS
69 depends on PPC_PSERIES
70 bool
71 default y
72
73config U3_DART
74 bool
75 depends on PPC_MULTIPLATFORM && PPC64
76 default n
77
78config PPC_RTAS
79 bool
80 default n
81
82config RTAS_ERROR_LOGGING
83 bool
84 depends on PPC_RTAS
85 default n
86
87config RTAS_PROC
88 bool "Proc interface to RTAS"
89 depends on PPC_RTAS
90 default y
91
92config RTAS_FLASH
93 tristate "Firmware flash interface"
94 depends on PPC64 && RTAS_PROC
95
96config PPC_PMI
97 tristate "Support for PMI"
98 depends PPC_IBM_CELL_BLADE
99 help
100 PMI (Platform Management Interrupt) is a way to
101 communicate with the BMC (Baseboard Mangement Controller).
102 It is used in some IBM Cell blades.
103 default m
104
105config MMIO_NVRAM
106 bool
107 default n
108
109config MPIC_BROKEN_U3
110 bool
111 depends on PPC_MAPLE
112 default y
113
114config IBMVIO
115 depends on PPC_PSERIES || PPC_ISERIES
116 bool
117 default y
118
119config IBMEBUS
120 depends on PPC_PSERIES
121 bool "Support for GX bus based adapters"
122 help
123 Bus device driver for GX bus based adapters.
124
125config PPC_MPC106
126 bool
127 default n
128
129config PPC_970_NAP
130 bool
131 default n
132
133config PPC_INDIRECT_IO
134 bool
135 select GENERIC_IOMAP
136 default n
137
138config GENERIC_IOMAP
139 bool
140 default n
141
142source "drivers/cpufreq/Kconfig"
143
144config CPU_FREQ_PMAC
145 bool "Support for Apple PowerBooks"
146 depends on CPU_FREQ && ADB_PMU && PPC32
147 select CPU_FREQ_TABLE
148 help
149 This adds support for frequency switching on Apple PowerBooks,
150 this currently includes some models of iBook & Titanium
151 PowerBook.
152
153config CPU_FREQ_PMAC64
154 bool "Support for some Apple G5s"
155 depends on CPU_FREQ && PPC64
156 select CPU_FREQ_TABLE
157 help
158 This adds support for frequency switching on Apple iMac G5,
159 and some of the more recent desktop G5 machines as well.
160
161config PPC601_SYNC_FIX
162 bool "Workarounds for PPC601 bugs"
163 depends on 6xx && (PPC_PREP || PPC_PMAC)
164 help
165 Some versions of the PPC601 (the first PowerPC chip) have bugs which
166 mean that extra synchronization instructions are required near
167 certain instructions, typically those that make major changes to the
168 CPU state. These extra instructions reduce performance slightly.
169 If you say N here, these extra instructions will not be included,
170 resulting in a kernel which will run faster but may not run at all
171 on some systems with the PPC601 chip.
172
173 If in doubt, say Y here.
174
175config TAU
176 bool "On-chip CPU temperature sensor support"
177 depends on 6xx
178 help
179 G3 and G4 processors have an on-chip temperature sensor called the
180 'Thermal Assist Unit (TAU)', which, in theory, can measure the on-die
181 temperature within 2-4 degrees Celsius. This option shows the current
182 on-die temperature in /proc/cpuinfo if the cpu supports it.
183
184 Unfortunately, on some chip revisions, this sensor is very inaccurate
185 and in many cases, does not work at all, so don't assume the cpu
186 temp is actually what /proc/cpuinfo says it is.
187
188config TAU_INT
189 bool "Interrupt driven TAU driver (DANGEROUS)"
190 depends on TAU
191 ---help---
192 The TAU supports an interrupt driven mode which causes an interrupt
193 whenever the temperature goes out of range. This is the fastest way
194 to get notified the temp has exceeded a range. With this option off,
195 a timer is used to re-check the temperature periodically.
196
197 However, on some cpus it appears that the TAU interrupt hardware
198 is buggy and can cause a situation which would lead unexplained hard
199 lockups.
200
201 Unless you are extending the TAU driver, or enjoy kernel/hardware
202 debugging, leave this option off.
203
204config TAU_AVERAGE
205 bool "Average high and low temp"
206 depends on TAU
207 ---help---
208 The TAU hardware can compare the temperature to an upper and lower
209 bound. The default behavior is to show both the upper and lower
210 bound in /proc/cpuinfo. If the range is large, the temperature is
211 either changing a lot, or the TAU hardware is broken (likely on some
212 G4's). If the range is small (around 4 degrees), the temperature is
213 relatively stable. If you say Y here, a single temperature value,
214 halfway between the upper and lower bounds, will be reported in
215 /proc/cpuinfo.
216
217 If in doubt, say N here.
218
219endmenu
diff --git a/arch/powerpc/platforms/cell/Kconfig b/arch/powerpc/platforms/cell/Kconfig
index 06a85b704331..53913a26ef42 100644
--- a/arch/powerpc/platforms/cell/Kconfig
+++ b/arch/powerpc/platforms/cell/Kconfig
@@ -1,3 +1,26 @@
1config PPC_CELL
2 bool
3 default n
4
5config PPC_CELL_NATIVE
6 bool
7 select PPC_CELL
8 select PPC_DCR_MMIO
9 select PPC_OF_PLATFORM_PCI
10 select PPC_INDIRECT_IO
11 select PPC_NATIVE
12 select MPIC
13 default n
14
15config PPC_IBM_CELL_BLADE
16 bool "IBM Cell Blade"
17 depends on PPC_MULTIPLATFORM && PPC64
18 select PPC_CELL_NATIVE
19 select PPC_RTAS
20 select MMIO_NVRAM
21 select PPC_UDBG_16550
22 select UDBG_RTAS_CONSOLE
23
1menu "Cell Broadband Engine options" 24menu "Cell Broadband Engine options"
2 depends on PPC_CELL 25 depends on PPC_CELL
3 26
diff --git a/arch/powerpc/platforms/celleb/Kconfig b/arch/powerpc/platforms/celleb/Kconfig
new file mode 100644
index 000000000000..2db1e293433e
--- /dev/null
+++ b/arch/powerpc/platforms/celleb/Kconfig
@@ -0,0 +1,9 @@
1config PPC_CELLEB
2 bool "Toshiba's Cell Reference Set 'Celleb' Architecture"
3 depends on PPC_MULTIPLATFORM && PPC64
4 select PPC_CELL
5 select PPC_OF_PLATFORM_PCI
6 select HAS_TXX9_SERIAL
7 select PPC_UDBG_BEAT
8 select USB_OHCI_BIG_ENDIAN_MMIO
9 select USB_EHCI_BIG_ENDIAN_MMIO
diff --git a/arch/powerpc/platforms/chrp/Kconfig b/arch/powerpc/platforms/chrp/Kconfig
new file mode 100644
index 000000000000..d2c690531963
--- /dev/null
+++ b/arch/powerpc/platforms/chrp/Kconfig
@@ -0,0 +1,11 @@
1config PPC_CHRP
2 bool "Common Hardware Reference Platform (CHRP) based machines"
3 depends on PPC_MULTIPLATFORM && PPC32
4 select MPIC
5 select PPC_I8259
6 select PPC_INDIRECT_PCI
7 select PPC_RTAS
8 select PPC_MPC106
9 select PPC_UDBG_16550
10 select PPC_NATIVE
11 default y
diff --git a/arch/powerpc/platforms/embedded6xx/Kconfig b/arch/powerpc/platforms/embedded6xx/Kconfig
index 3410bcbc9dbe..9557908ef545 100644
--- a/arch/powerpc/platforms/embedded6xx/Kconfig
+++ b/arch/powerpc/platforms/embedded6xx/Kconfig
@@ -2,78 +2,6 @@ choice
2 prompt "Machine Type" 2 prompt "Machine Type"
3 depends on EMBEDDED6xx 3 depends on EMBEDDED6xx
4 4
5config KATANA
6 bool "Artesyn-Katana"
7 help
8 Select KATANA if configuring an Artesyn KATANA 750i or 3750
9 cPCI board.
10
11config WILLOW
12 bool "Cogent-Willow"
13
14config CPCI690
15 bool "Force-CPCI690"
16 help
17 Select CPCI690 if configuring a Force CPCI690 cPCI board.
18
19config POWERPMC250
20 bool "Force-PowerPMC250"
21
22config CHESTNUT
23 bool "IBM 750FX Eval board or 750GX Eval board"
24 help
25 Select CHESTNUT if configuring an IBM 750FX Eval Board or a
26 IBM 750GX Eval board.
27
28config SPRUCE
29 bool "IBM-Spruce"
30 select PPC_INDIRECT_PCI
31
32config HDPU
33 bool "Sky-HDPU"
34 help
35 Select HDPU if configuring a Sky Computers Compute Blade.
36
37config HDPU_FEATURES
38 depends on HDPU
39 tristate "HDPU-Features"
40 help
41 Select to enable HDPU enhanced features.
42
43config EV64260
44 bool "Marvell-EV64260BP"
45 help
46 Select EV64260 if configuring a Marvell (formerly Galileo)
47 EV64260BP Evaluation platform.
48
49config LOPEC
50 bool "Motorola-LoPEC"
51 select PPC_I8259
52
53config MVME5100
54 bool "Motorola-MVME5100"
55 select PPC_INDIRECT_PCI
56
57config PPLUS
58 bool "Motorola-PowerPlus"
59 select PPC_I8259
60 select PPC_INDIRECT_PCI
61
62config PRPMC750
63 bool "Motorola-PrPMC750"
64 select PPC_INDIRECT_PCI
65
66config PRPMC800
67 bool "Motorola-PrPMC800"
68 select PPC_INDIRECT_PCI
69
70config SANDPOINT
71 bool "Motorola-Sandpoint"
72 select PPC_I8259
73 help
74 Select SANDPOINT if configuring for a Motorola Sandpoint X3
75 (any flavor).
76
77config LINKSTATION 5config LINKSTATION
78 bool "Linkstation / Kurobox(HG) from Buffalo" 6 bool "Linkstation / Kurobox(HG) from Buffalo"
79 select MPIC 7 select MPIC
@@ -97,212 +25,24 @@ config MPC7448HPC2
97 help 25 help
98 Select MPC7448HPC2 if configuring for Freescale MPC7448HPC2 (Taiga) 26 Select MPC7448HPC2 if configuring for Freescale MPC7448HPC2 (Taiga)
99 platform 27 platform
100
101config RADSTONE_PPC7D
102 bool "Radstone Technology PPC7D board"
103 select PPC_I8259
104
105config PAL4
106 bool "SBS-Palomar4"
107
108config EST8260
109 bool "EST8260"
110 ---help---
111 The EST8260 is a single-board computer manufactured by Wind River
112 Systems, Inc. (formerly Embedded Support Tools Corp.) and based on
113 the MPC8260. Wind River Systems has a website at
114 <http://www.windriver.com/>, but the EST8260 cannot be found on it
115 and has probably been discontinued or rebadged.
116
117config SBC82xx
118 bool "SBC82xx"
119 ---help---
120 SBC PowerQUICC II, single-board computer with MPC82xx CPU
121 Manufacturer: Wind River Systems, Inc.
122 Date of Release: May 2003
123 End of Life: -
124 URL: <http://www.windriver.com/>
125
126config SBS8260
127 bool "SBS8260"
128
129config RPX8260
130 bool "RPXSUPER"
131
132config TQM8260
133 bool "TQM8260"
134 ---help---
135 MPC8260 based module, little larger than credit card,
136 up to 128 MB global + 64 MB local RAM, 32 MB Flash,
137 32 kB EEPROM, 256 kB L@ Cache, 10baseT + 100baseT Ethernet,
138 2 x serial ports, ...
139 Manufacturer: TQ Components, www.tq-group.de
140 Date of Release: June 2001
141 End of Life: not yet :-)
142 URL: <http://www.denx.de/PDF/TQM82xx_SPEC_Rev005.pdf>
143
144config ADS8272
145 bool "ADS8272"
146
147config PQ2FADS
148 bool "Freescale-PQ2FADS"
149 help
150 Select PQ2FADS if you wish to configure for a Freescale
151 PQ2FADS board (-VR or -ZU).
152
153config EV64360
154 bool "Marvell-EV64360BP"
155 help
156 Select EV64360 if configuring a Marvell EV64360BP Evaluation
157 platform.
158endchoice 28endchoice
159 29
160config PQ2ADS
161 bool
162 depends on ADS8272
163 default y
164
165config TQM8xxL
166 bool
167 depends on 8xx && (TQM823L || TQM850L || FPS850L || TQM855L || TQM860L)
168 default y
169
170config 8260
171 bool "CPM2 Support" if WILLOW
172 depends on 6xx
173 default y if TQM8260 || RPX8260 || EST8260 || SBS8260 || SBC82xx || PQ2FADS
174 help
175 The MPC8260 is a typical embedded CPU made by Motorola. Selecting
176 this option means that you wish to build a kernel for a machine with
177 an 8260 class CPU.
178
179config 8272
180 bool
181 depends on 6xx
182 default y if ADS8272
183 select 8260
184 help
185 The MPC8272 CPM has a different internal dpram setup than other CPM2
186 devices
187
188config CPM2
189 bool
190 depends on 8260 || MPC8560 || MPC8555
191 default y
192 help
193 The CPM2 (Communications Processor Module) is a coprocessor on
194 embedded CPUs made by Motorola. Selecting this option means that
195 you wish to build a kernel for a machine with a CPM2 coprocessor
196 on it (826x, 827x, 8560).
197
198config PPC_GEN550
199 bool
200 depends on SANDPOINT || SPRUCE || PPLUS || \
201 PRPMC750 || PRPMC800 || LOPEC || \
202 (EV64260 && !SERIAL_MPSC) || CHESTNUT || RADSTONE_PPC7D || \
203 83xx || LINKSTATION
204 default y
205
206config FORCE
207 bool
208 depends on 6xx && POWERPMC250
209 default y
210
211config GT64260
212 bool
213 depends on EV64260 || CPCI690
214 default y
215
216config MV64360 # Really MV64360 & MV64460
217 bool
218 depends on CHESTNUT || KATANA || RADSTONE_PPC7D || HDPU || EV64360
219 default y
220
221config MV64X60
222 bool
223 depends on (GT64260 || MV64360)
224 select PPC_INDIRECT_PCI
225 default y
226
227config TSI108_BRIDGE 30config TSI108_BRIDGE
228 bool 31 bool
229 depends on MPC7448HPC2 32 depends on MPC7448HPC2
230 default y 33 default y
231 34
232menu "Set bridge options"
233 depends on MV64X60
234
235config NOT_COHERENT_CACHE
236 bool "Turn off Cache Coherency"
237 default n
238 help
239 Some 64x60 bridges lock up when trying to enforce cache coherency.
240 When this option is selected, cache coherency will be turned off.
241 Note that this can cause other problems (e.g., stale data being
242 speculatively loaded via a cached mapping). Use at your own risk.
243
244config MV64X60_BASE
245 hex "Set bridge base used by firmware"
246 default "0xf1000000"
247 help
248 A firmware can leave the base address of the bridge's registers at
249 a non-standard location. If so, set this value to reflect the
250 address of that non-standard location.
251
252config MV64X60_NEW_BASE
253 hex "Set bridge base used by kernel"
254 default "0xf1000000"
255 help
256 If the current base address of the bridge's registers is not where
257 you want it, set this value to the address that you want it moved to.
258
259endmenu
260
261config NONMONARCH_SUPPORT
262 bool "Enable Non-Monarch Support"
263 depends on PRPMC800
264
265config HARRIER
266 bool
267 depends on PRPMC800
268 default y
269
270config EPIC_SERIAL_MODE
271 bool
272 depends on 6xx && (LOPEC || SANDPOINT)
273 default y
274
275config MPC10X_BRIDGE 35config MPC10X_BRIDGE
276 bool 36 bool
277 depends on POWERPMC250 || LOPEC || SANDPOINT || LINKSTATION 37 depends on LINKSTATION
278 select PPC_INDIRECT_PCI 38 select PPC_INDIRECT_PCI
279 default y 39 default y
280 40
281config MPC10X_OPENPIC 41config MPC10X_OPENPIC
282 bool 42 bool
283 depends on POWERPMC250 || LOPEC || SANDPOINT || LINKSTATION 43 depends on LINKSTATION
284 default y 44 default y
285 45
286config MPC10X_STORE_GATHERING 46config MPC10X_STORE_GATHERING
287 bool "Enable MPC10x store gathering" 47 bool "Enable MPC10x store gathering"
288 depends on MPC10X_BRIDGE 48 depends on MPC10X_BRIDGE
289
290config SANDPOINT_ENABLE_UART1
291 bool "Enable DUART mode on Sandpoint"
292 depends on SANDPOINT
293 help
294 If this option is enabled then the MPC824x processor will run
295 in DUART mode instead of UART mode.
296
297config HARRIER_STORE_GATHERING
298 bool "Enable Harrier store gathering"
299 depends on HARRIER
300
301config MVME5100_IPMC761_PRESENT
302 bool "MVME5100 configured with an IPMC761"
303 depends on MVME5100
304 select PPC_I8259
305
306config SPRUCE_BAUD_33M
307 bool "Spruce baud clock support"
308 depends on SPRUCE
diff --git a/arch/powerpc/platforms/iseries/Kconfig b/arch/powerpc/platforms/iseries/Kconfig
index 54e6b3b6f261..46c3a8e7c3a8 100644
--- a/arch/powerpc/platforms/iseries/Kconfig
+++ b/arch/powerpc/platforms/iseries/Kconfig
@@ -1,3 +1,7 @@
1config PPC_ISERIES
2 bool "IBM Legacy iSeries"
3 depends on PPC_MULTIPLATFORM && PPC64
4 select PPC_INDIRECT_IO
1 5
2menu "iSeries device drivers" 6menu "iSeries device drivers"
3 depends on PPC_ISERIES 7 depends on PPC_ISERIES
diff --git a/arch/powerpc/platforms/maple/Kconfig b/arch/powerpc/platforms/maple/Kconfig
new file mode 100644
index 000000000000..5f364b8e5c0f
--- /dev/null
+++ b/arch/powerpc/platforms/maple/Kconfig
@@ -0,0 +1,17 @@
1config PPC_MAPLE
2 depends on PPC_MULTIPLATFORM && PPC64
3 bool "Maple 970FX Evaluation Board"
4 select MPIC
5 select U3_DART
6 select MPIC_BROKEN_U3
7 select GENERIC_TBSYNC
8 select PPC_UDBG_16550
9 select PPC_970_NAP
10 select PPC_NATIVE
11 select PPC_RTAS
12 select MMIO_NVRAM
13 select ATA_NONSTANDARD if ATA
14 default n
15 help
16 This option enables support for the Maple 970FX Evaluation Board.
17 For more information, refer to <http://www.970eval.com>
diff --git a/arch/powerpc/platforms/pasemi/Kconfig b/arch/powerpc/platforms/pasemi/Kconfig
index 68dc529dfd2f..64e55250ef46 100644
--- a/arch/powerpc/platforms/pasemi/Kconfig
+++ b/arch/powerpc/platforms/pasemi/Kconfig
@@ -1,3 +1,15 @@
1config PPC_PASEMI
2 depends on PPC_MULTIPLATFORM && PPC64
3 bool "PA Semi SoC-based platforms"
4 default n
5 select MPIC
6 select PPC_UDBG_16550
7 select GENERIC_TBSYNC
8 select PPC_NATIVE
9 help
10 This option enables support for PA Semi's PWRficient line
11 of SoC processors, including PA6T-1682M
12
1menu "PA Semi PWRficient options" 13menu "PA Semi PWRficient options"
2 depends on PPC_PASEMI 14 depends on PPC_PASEMI
3 15
diff --git a/arch/powerpc/platforms/powermac/Kconfig b/arch/powerpc/platforms/powermac/Kconfig
new file mode 100644
index 000000000000..02d9c7dba876
--- /dev/null
+++ b/arch/powerpc/platforms/powermac/Kconfig
@@ -0,0 +1,20 @@
1config PPC_PMAC
2 bool "Apple PowerMac based machines"
3 depends on PPC_MULTIPLATFORM
4 select MPIC
5 select PPC_INDIRECT_PCI if PPC32
6 select PPC_MPC106 if PPC32
7 select PPC_NATIVE
8 default y
9
10config PPC_PMAC64
11 bool
12 depends on PPC_PMAC && POWER4
13 select MPIC
14 select U3_DART
15 select MPIC_BROKEN_U3
16 select GENERIC_TBSYNC
17 select PPC_970_NAP
18 default y
19
20
diff --git a/arch/powerpc/platforms/prep/Kconfig b/arch/powerpc/platforms/prep/Kconfig
index 673ac47a1626..29d411279b0c 100644
--- a/arch/powerpc/platforms/prep/Kconfig
+++ b/arch/powerpc/platforms/prep/Kconfig
@@ -1,3 +1,12 @@
1config PPC_PREP
2 bool "PowerPC Reference Platform (PReP) based machines"
3 depends on PPC_MULTIPLATFORM && PPC32 && BROKEN
4 select MPIC
5 select PPC_I8259
6 select PPC_INDIRECT_PCI
7 select PPC_UDBG_16550
8 select PPC_NATIVE
9 default n
1 10
2config PREP_RESIDUAL 11config PREP_RESIDUAL
3 bool "Support for PReP Residual Data" 12 bool "Support for PReP Residual Data"
diff --git a/arch/powerpc/platforms/ps3/Kconfig b/arch/powerpc/platforms/ps3/Kconfig
index 1a481a60a883..40f0008af4d1 100644
--- a/arch/powerpc/platforms/ps3/Kconfig
+++ b/arch/powerpc/platforms/ps3/Kconfig
@@ -1,3 +1,19 @@
1config PPC_PS3
2 bool "Sony PS3 (incomplete)"
3 depends on PPC_MULTIPLATFORM && PPC64
4 select PPC_CELL
5 select USB_ARCH_HAS_OHCI
6 select USB_OHCI_LITTLE_ENDIAN
7 select USB_OHCI_BIG_ENDIAN_MMIO
8 select USB_ARCH_HAS_EHCI
9 select USB_EHCI_BIG_ENDIAN_MMIO
10 help
11 This option enables support for the Sony PS3 game console
12 and other platforms using the PS3 hypervisor.
13 Support for this platform is not yet complete, so
14 enabling this will not result in a bootable kernel on a
15 PS3 system.
16
1menu "PS3 Platform Options" 17menu "PS3 Platform Options"
2 depends on PPC_PS3 18 depends on PPC_PS3
3 19
diff --git a/arch/powerpc/platforms/pseries/Kconfig b/arch/powerpc/platforms/pseries/Kconfig
index a57032cf6f1b..16e4e401b820 100644
--- a/arch/powerpc/platforms/pseries/Kconfig
+++ b/arch/powerpc/platforms/pseries/Kconfig
@@ -1,3 +1,13 @@
1config PPC_PSERIES
2 depends on PPC_MULTIPLATFORM && PPC64
3 bool "IBM pSeries & new (POWER5-based) iSeries"
4 select MPIC
5 select PPC_I8259
6 select PPC_RTAS
7 select RTAS_ERROR_LOGGING
8 select PPC_UDBG_16550
9 select PPC_NATIVE
10 default y
1 11
2config PPC_SPLPAR 12config PPC_SPLPAR
3 depends on PPC_PSERIES 13 depends on PPC_PSERIES