aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/Kconfig80
-rw-r--r--arch/powerpc/platforms/chrp/Kconfig11
-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/prep/Kconfig9
-rw-r--r--arch/powerpc/platforms/pseries/Kconfig10
7 files changed, 69 insertions, 74 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 479828daaecc..c5014ba19fd5 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -404,77 +404,14 @@ config QUICC_ENGINE
404 Selecting this option means that you wish to build a kernel 404 Selecting this option means that you wish to build a kernel
405 for a machine with a QE coprocessor. 405 for a machine with a QE coprocessor.
406 406
407config PPC_PSERIES 407source "arch/powerpc/platforms/pseries/Kconfig"
408 depends on PPC_MULTIPLATFORM && PPC64 408source "arch/powerpc/platforms/iseries/Kconfig"
409 bool "IBM pSeries & new (POWER5-based) iSeries" 409source "arch/powerpc/platforms/chrp/Kconfig"
410 select MPIC
411 select PPC_I8259
412 select PPC_RTAS
413 select RTAS_ERROR_LOGGING
414 select PPC_UDBG_16550
415 select PPC_NATIVE
416 default y
417
418config PPC_ISERIES
419 bool "IBM Legacy iSeries"
420 depends on PPC_MULTIPLATFORM && PPC64
421 select PPC_INDIRECT_IO
422
423config PPC_CHRP
424 bool "Common Hardware Reference Platform (CHRP) based machines"
425 depends on PPC_MULTIPLATFORM && PPC32
426 select MPIC
427 select PPC_I8259
428 select PPC_INDIRECT_PCI
429 select PPC_RTAS
430 select PPC_MPC106
431 select PPC_UDBG_16550
432 select PPC_NATIVE
433 default y
434
435source "arch/powerpc/platforms/52xx/Kconfig" 410source "arch/powerpc/platforms/52xx/Kconfig"
436source "arch/powerpc/platforms/powermac/Kconfig" 411source "arch/powerpc/platforms/powermac/Kconfig"
437 412source "arch/powerpc/platforms/prep/Kconfig"
438config PPC_PREP 413source "arch/powerpc/platforms/maple/Kconfig"
439 bool "PowerPC Reference Platform (PReP) based machines" 414source "arch/powerpc/platforms/pasemi/Kconfig"
440 depends on PPC_MULTIPLATFORM && PPC32 && BROKEN
441 select MPIC
442 select PPC_I8259
443 select PPC_INDIRECT_PCI
444 select PPC_UDBG_16550
445 select PPC_NATIVE
446 default n
447
448config PPC_MAPLE
449 depends on PPC_MULTIPLATFORM && PPC64
450 bool "Maple 970FX Evaluation Board"
451 select MPIC
452 select U3_DART
453 select MPIC_BROKEN_U3
454 select GENERIC_TBSYNC
455 select PPC_UDBG_16550
456 select PPC_970_NAP
457 select PPC_NATIVE
458 select PPC_RTAS
459 select MMIO_NVRAM
460 select ATA_NONSTANDARD if ATA
461 default n
462 help
463 This option enables support for the Maple 970FX Evaluation Board.
464 For more information, refer to <http://www.970eval.com>
465
466config PPC_PASEMI
467 depends on PPC_MULTIPLATFORM && PPC64
468 bool "PA Semi SoC-based platforms"
469 default n
470 select MPIC
471 select PPC_UDBG_16550
472 select GENERIC_TBSYNC
473 select PPC_NATIVE
474 help
475 This option enables support for PA Semi's PWRficient line
476 of SoC processors, including PA6T-1682M
477
478source arch/powerpc/platforms/celleb/Kconfig 415source arch/powerpc/platforms/celleb/Kconfig
479source arch/powerpc/platforms/ps3/Kconfig 416source arch/powerpc/platforms/ps3/Kconfig
480source arch/powerpc/platforms/cell/Kconfig 417source arch/powerpc/platforms/cell/Kconfig
@@ -657,7 +594,6 @@ source arch/powerpc/platforms/83xx/Kconfig
657source arch/powerpc/platforms/85xx/Kconfig 594source arch/powerpc/platforms/85xx/Kconfig
658source arch/powerpc/platforms/86xx/Kconfig 595source arch/powerpc/platforms/86xx/Kconfig
659source arch/powerpc/platforms/8xx/Kconfig 596source arch/powerpc/platforms/8xx/Kconfig
660source arch/powerpc/platforms/pasemi/Kconfig
661 597
662menu "Kernel options" 598menu "Kernel options"
663 599
@@ -762,7 +698,6 @@ config IRQ_ALL_CPUS
762 CPU. Generally saying Y is safe, although some problems have been 698 CPU. Generally saying Y is safe, although some problems have been
763 reported with SMP Power Macintoshes with this option enabled. 699 reported with SMP Power Macintoshes with this option enabled.
764 700
765source "arch/powerpc/platforms/pseries/Kconfig"
766 701
767config NUMA 702config NUMA
768 bool "NUMA support" 703 bool "NUMA support"
@@ -834,8 +769,6 @@ config PROC_DEVICETREE
834 an image of the device tree that the kernel copies from Open 769 an image of the device tree that the kernel copies from Open
835 Firmware or other boot firmware. If unsure, say Y here. 770 Firmware or other boot firmware. If unsure, say Y here.
836 771
837source "arch/powerpc/platforms/prep/Kconfig"
838
839config CMDLINE_BOOL 772config CMDLINE_BOOL
840 bool "Default bootloader kernel arguments" 773 bool "Default bootloader kernel arguments"
841 774
@@ -1132,7 +1065,6 @@ source "fs/Kconfig"
1132 1065
1133source "arch/powerpc/sysdev/qe_lib/Kconfig" 1066source "arch/powerpc/sysdev/qe_lib/Kconfig"
1134 1067
1135source "arch/powerpc/platforms/iseries/Kconfig"
1136 1068
1137source "lib/Kconfig" 1069source "lib/Kconfig"
1138 1070
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/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/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/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