diff options
Diffstat (limited to 'arch/powerpc/Kconfig')
-rw-r--r-- | arch/powerpc/Kconfig | 37 |
1 files changed, 5 insertions, 32 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 033666cf0f77..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 | |||
196 | config E200 | 195 | config E200 |
197 | bool "Freescale e200" | 196 | bool "Freescale e200" |
198 | 197 | ||
@@ -375,9 +374,6 @@ source "init/Kconfig" | |||
375 | 374 | ||
376 | source "arch/powerpc/platforms/Kconfig" | 375 | source "arch/powerpc/platforms/Kconfig" |
377 | 376 | ||
378 | source arch/powerpc/platforms/embedded6xx/Kconfig | ||
379 | source arch/powerpc/platforms/4xx/Kconfig | ||
380 | |||
381 | menu "Kernel options" | 377 | menu "Kernel options" |
382 | 378 | ||
383 | config HIGHMEM | 379 | config HIGHMEM |
@@ -459,15 +455,6 @@ config CRASH_DUMP | |||
459 | 455 | ||
460 | Don't change this unless you know what you are doing. | 456 | Don't change this unless you know what you are doing. |
461 | 457 | ||
462 | config EMBEDDEDBOOT | ||
463 | bool | ||
464 | depends on 8xx || 8260 | ||
465 | default y | ||
466 | |||
467 | config PC_KEYBOARD | ||
468 | bool "PC PS/2 style Keyboard" | ||
469 | depends on 4xx || CPM2 | ||
470 | |||
471 | config PPCBUG_NVRAM | 458 | config PPCBUG_NVRAM |
472 | bool "Enable reading PPCBUG NVRAM during boot" if PPLUS || LOPEC | 459 | bool "Enable reading PPCBUG NVRAM during boot" if PPLUS || LOPEC |
473 | default y if PPC_PREP | 460 | default y if PPC_PREP |
@@ -481,7 +468,6 @@ config IRQ_ALL_CPUS | |||
481 | CPU. Generally saying Y is safe, although some problems have been | 468 | CPU. Generally saying Y is safe, although some problems have been |
482 | reported with SMP Power Macintoshes with this option enabled. | 469 | reported with SMP Power Macintoshes with this option enabled. |
483 | 470 | ||
484 | |||
485 | config NUMA | 471 | config NUMA |
486 | bool "NUMA support" | 472 | bool "NUMA support" |
487 | depends on PPC64 | 473 | depends on PPC64 |
@@ -531,10 +517,10 @@ config PPC_64K_PAGES | |||
531 | depends on PPC64 | 517 | depends on PPC64 |
532 | help | 518 | help |
533 | 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 |
534 | without processor support for 64k pages, the kernel will simulate | 520 | without processor support for 64k pages, the kernel will simulate |
535 | them by loading each individual 4k page on demand transparently, | 521 | them by loading each individual 4k page on demand transparently, |
536 | 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 |
537 | normal application pages. | 523 | normal application pages. |
538 | 524 | ||
539 | config SCHED_SMT | 525 | config SCHED_SMT |
540 | bool "SMT (Hyperthreading) scheduler support" | 526 | bool "SMT (Hyperthreading) scheduler support" |
@@ -614,18 +600,6 @@ config GENERIC_ISA_DMA | |||
614 | depends on PPC64 || POWER4 || 6xx && !CPM2 | 600 | depends on PPC64 || POWER4 || 6xx && !CPM2 |
615 | default y | 601 | default y |
616 | 602 | ||
617 | config MPIC | ||
618 | bool | ||
619 | default n | ||
620 | |||
621 | config MPIC_WEIRD | ||
622 | bool | ||
623 | default n | ||
624 | |||
625 | config PPC_I8259 | ||
626 | bool | ||
627 | default n | ||
628 | |||
629 | config PPC_INDIRECT_PCI | 603 | config PPC_INDIRECT_PCI |
630 | bool | 604 | bool |
631 | depends on PCI | 605 | depends on PCI |
@@ -857,11 +831,10 @@ source "fs/Kconfig" | |||
857 | 831 | ||
858 | source "arch/powerpc/sysdev/qe_lib/Kconfig" | 832 | source "arch/powerpc/sysdev/qe_lib/Kconfig" |
859 | 833 | ||
860 | |||
861 | source "lib/Kconfig" | 834 | source "lib/Kconfig" |
862 | 835 | ||
863 | menu "Instrumentation Support" | 836 | menu "Instrumentation Support" |
864 | depends on EXPERIMENTAL | 837 | depends on EXPERIMENTAL |
865 | 838 | ||
866 | source "arch/powerpc/oprofile/Kconfig" | 839 | source "arch/powerpc/oprofile/Kconfig" |
867 | 840 | ||