aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/Kconfig
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2007-02-13 01:43:25 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2007-02-13 01:43:25 -0500
commitd9bc125caf592b7d081021f32ce5b717efdf70c8 (patch)
tree263b7066ba22ddce21db610c0300f6eaac6f2064 /arch/mips/Kconfig
parent43d78ef2ba5bec26d0315859e8324bfc0be23766 (diff)
parentec2f9d1331f658433411c58077871e1eef4ee1b4 (diff)
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts: net/sunrpc/auth_gss/gss_krb5_crypto.c net/sunrpc/auth_gss/gss_spkm3_token.c net/sunrpc/clnt.c Merge with mainline and fix conflicts.
Diffstat (limited to 'arch/mips/Kconfig')
-rw-r--r--arch/mips/Kconfig143
1 files changed, 79 insertions, 64 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index bbd386f572d9..5fe195a41a80 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -8,6 +8,10 @@ mainmenu "Linux/MIPS Kernel Configuration"
8 8
9menu "Machine selection" 9menu "Machine selection"
10 10
11config ZONE_DMA
12 bool
13 default y
14
11choice 15choice
12 prompt "System type" 16 prompt "System type"
13 default SGI_IP22 17 default SGI_IP22
@@ -575,6 +579,7 @@ config SGI_IP27
575 select DMA_IP27 579 select DMA_IP27
576 select EARLY_PRINTK 580 select EARLY_PRINTK
577 select HW_HAS_PCI 581 select HW_HAS_PCI
582 select NR_CPUS_DEFAULT_64
578 select PCI_DOMAINS 583 select PCI_DOMAINS
579 select SYS_HAS_CPU_R10000 584 select SYS_HAS_CPU_R10000
580 select SYS_SUPPORTS_64BIT_KERNEL 585 select SYS_SUPPORTS_64BIT_KERNEL
@@ -612,6 +617,7 @@ config SIBYTE_BIGSUR
612 bool "Sibyte BCM91480B-BigSur" 617 bool "Sibyte BCM91480B-BigSur"
613 select BOOT_ELF32 618 select BOOT_ELF32
614 select DMA_COHERENT 619 select DMA_COHERENT
620 select NR_CPUS_DEFAULT_4
615 select PCI_DOMAINS 621 select PCI_DOMAINS
616 select SIBYTE_BCM1x80 622 select SIBYTE_BCM1x80
617 select SWAP_IO_SPACE 623 select SWAP_IO_SPACE
@@ -623,6 +629,7 @@ config SIBYTE_SWARM
623 bool "Sibyte BCM91250A-SWARM" 629 bool "Sibyte BCM91250A-SWARM"
624 select BOOT_ELF32 630 select BOOT_ELF32
625 select DMA_COHERENT 631 select DMA_COHERENT
632 select NR_CPUS_DEFAULT_2
626 select SIBYTE_SB1250 633 select SIBYTE_SB1250
627 select SWAP_IO_SPACE 634 select SWAP_IO_SPACE
628 select SYS_HAS_CPU_SB1 635 select SYS_HAS_CPU_SB1
@@ -635,6 +642,7 @@ config SIBYTE_SENTOSA
635 depends on EXPERIMENTAL 642 depends on EXPERIMENTAL
636 select BOOT_ELF32 643 select BOOT_ELF32
637 select DMA_COHERENT 644 select DMA_COHERENT
645 select NR_CPUS_DEFAULT_2
638 select SIBYTE_SB1250 646 select SIBYTE_SB1250
639 select SWAP_IO_SPACE 647 select SWAP_IO_SPACE
640 select SYS_HAS_CPU_SB1 648 select SYS_HAS_CPU_SB1
@@ -668,6 +676,7 @@ config SIBYTE_PTSWARM
668 depends on EXPERIMENTAL 676 depends on EXPERIMENTAL
669 select BOOT_ELF32 677 select BOOT_ELF32
670 select DMA_COHERENT 678 select DMA_COHERENT
679 select NR_CPUS_DEFAULT_2
671 select SIBYTE_SB1250 680 select SIBYTE_SB1250
672 select SWAP_IO_SPACE 681 select SWAP_IO_SPACE
673 select SYS_HAS_CPU_SB1 682 select SYS_HAS_CPU_SB1
@@ -680,6 +689,7 @@ config SIBYTE_LITTLESUR
680 depends on EXPERIMENTAL 689 depends on EXPERIMENTAL
681 select BOOT_ELF32 690 select BOOT_ELF32
682 select DMA_COHERENT 691 select DMA_COHERENT
692 select NR_CPUS_DEFAULT_2
683 select SIBYTE_SB1250 693 select SIBYTE_SB1250
684 select SWAP_IO_SPACE 694 select SWAP_IO_SPACE
685 select SYS_HAS_CPU_SB1 695 select SYS_HAS_CPU_SB1
@@ -747,6 +757,7 @@ config TOSHIBA_JMR3927
747 select SWAP_IO_SPACE 757 select SWAP_IO_SPACE
748 select SYS_HAS_CPU_TX39XX 758 select SYS_HAS_CPU_TX39XX
749 select SYS_SUPPORTS_32BIT_KERNEL 759 select SYS_SUPPORTS_32BIT_KERNEL
760 select SYS_SUPPORTS_LITTLE_ENDIAN
750 select SYS_SUPPORTS_BIG_ENDIAN 761 select SYS_SUPPORTS_BIG_ENDIAN
751 select TOSHIBA_BOARDS 762 select TOSHIBA_BOARDS
752 763
@@ -761,6 +772,7 @@ config TOSHIBA_RBTX4927
761 select SYS_HAS_CPU_TX49XX 772 select SYS_HAS_CPU_TX49XX
762 select SYS_SUPPORTS_32BIT_KERNEL 773 select SYS_SUPPORTS_32BIT_KERNEL
763 select SYS_SUPPORTS_64BIT_KERNEL 774 select SYS_SUPPORTS_64BIT_KERNEL
775 select SYS_SUPPORTS_LITTLE_ENDIAN
764 select SYS_SUPPORTS_BIG_ENDIAN 776 select SYS_SUPPORTS_BIG_ENDIAN
765 select TOSHIBA_BOARDS 777 select TOSHIBA_BOARDS
766 select GENERIC_HARDIRQS_NO__DO_IRQ 778 select GENERIC_HARDIRQS_NO__DO_IRQ
@@ -790,23 +802,6 @@ config TOSHIBA_RBTX4938
790 802
791endchoice 803endchoice
792 804
793config KEXEC
794 bool "Kexec system call (EXPERIMENTAL)"
795 depends on EXPERIMENTAL
796 help
797 kexec is a system call that implements the ability to shutdown your
798 current kernel, and to start another kernel. It is like a reboot
799 but it is indepedent of the system firmware. And like a reboot
800 you can start any kernel with it, not just Linux.
801
802 The name comes from the similiarity to the exec system call.
803
804 It is an ongoing process to be certain the hardware in a machine
805 is properly shutdown, so do not be surprised if this code does not
806 initially work for you. It may help to enable device hotplugging
807 support. As of this writing the exact hardware interface is
808 strongly in flux, so no good recommendation can be made.
809
810source "arch/mips/ddb5xxx/Kconfig" 805source "arch/mips/ddb5xxx/Kconfig"
811source "arch/mips/gt64120/ev64120/Kconfig" 806source "arch/mips/gt64120/ev64120/Kconfig"
812source "arch/mips/jazz/Kconfig" 807source "arch/mips/jazz/Kconfig"
@@ -945,6 +940,9 @@ config CPU_LITTLE_ENDIAN
945 940
946endchoice 941endchoice
947 942
943config SYS_SUPPORTS_APM_EMULATION
944 bool
945
948config SYS_SUPPORTS_BIG_ENDIAN 946config SYS_SUPPORTS_BIG_ENDIAN
949 bool 947 bool
950 948
@@ -1012,6 +1010,7 @@ config SOC_AU1X00
1012 bool 1010 bool
1013 select SYS_HAS_CPU_MIPS32_R1 1011 select SYS_HAS_CPU_MIPS32_R1
1014 select SYS_SUPPORTS_32BIT_KERNEL 1012 select SYS_SUPPORTS_32BIT_KERNEL
1013 select SYS_SUPPORTS_APM_EMULATION
1015 1014
1016config PNX8550 1015config PNX8550
1017 bool 1016 bool
@@ -1541,6 +1540,8 @@ config MIPS_MT_SMTC
1541 select CPU_MIPSR2_IRQ_VI 1540 select CPU_MIPSR2_IRQ_VI
1542 select CPU_MIPSR2_SRS 1541 select CPU_MIPSR2_SRS
1543 select MIPS_MT 1542 select MIPS_MT
1543 select NR_CPUS_DEFAULT_2
1544 select NR_CPUS_DEFAULT_8
1544 select SMP 1545 select SMP
1545 select SYS_SUPPORTS_SMP 1546 select SYS_SUPPORTS_SMP
1546 help 1547 help
@@ -1756,13 +1757,34 @@ config SMP
1756config SYS_SUPPORTS_SMP 1757config SYS_SUPPORTS_SMP
1757 bool 1758 bool
1758 1759
1760config NR_CPUS_DEFAULT_2
1761 bool
1762
1763config NR_CPUS_DEFAULT_4
1764 bool
1765
1766config NR_CPUS_DEFAULT_8
1767 bool
1768
1769config NR_CPUS_DEFAULT_16
1770 bool
1771
1772config NR_CPUS_DEFAULT_32
1773 bool
1774
1775config NR_CPUS_DEFAULT_64
1776 bool
1777
1759config NR_CPUS 1778config NR_CPUS
1760 int "Maximum number of CPUs (2-64)" 1779 int "Maximum number of CPUs (2-64)"
1761 range 2 64 1780 range 2 64
1762 depends on SMP 1781 depends on SMP
1763 default "64" if SGI_IP27 1782 default "2" if NR_CPUS_DEFAULT_2
1764 default "2" 1783 default "4" if NR_CPUS_DEFAULT_4
1765 default "8" if MIPS_MT_SMTC 1784 default "8" if NR_CPUS_DEFAULT_8
1785 default "16" if NR_CPUS_DEFAULT_16
1786 default "32" if NR_CPUS_DEFAULT_32
1787 default "64" if NR_CPUS_DEFAULT_64
1766 help 1788 help
1767 This allows you to specify the maximum number of CPUs which this 1789 This allows you to specify the maximum number of CPUs which this
1768 kernel will support. The maximum supported value is 32 for 32-bit 1790 kernel will support. The maximum supported value is 32 for 32-bit
@@ -1859,6 +1881,40 @@ config MIPS_INSANE_LARGE
1859 This will result in additional memory usage, so it is not 1881 This will result in additional memory usage, so it is not
1860 recommended for normal users. 1882 recommended for normal users.
1861 1883
1884config KEXEC
1885 bool "Kexec system call (EXPERIMENTAL)"
1886 depends on EXPERIMENTAL
1887 help
1888 kexec is a system call that implements the ability to shutdown your
1889 current kernel, and to start another kernel. It is like a reboot
1890 but it is indepedent of the system firmware. And like a reboot
1891 you can start any kernel with it, not just Linux.
1892
1893 The name comes from the similiarity to the exec system call.
1894
1895 It is an ongoing process to be certain the hardware in a machine
1896 is properly shutdown, so do not be surprised if this code does not
1897 initially work for you. It may help to enable device hotplugging
1898 support. As of this writing the exact hardware interface is
1899 strongly in flux, so no good recommendation can be made.
1900
1901config SECCOMP
1902 bool "Enable seccomp to safely compute untrusted bytecode"
1903 depends on PROC_FS && BROKEN
1904 default y
1905 help
1906 This kernel feature is useful for number crunching applications
1907 that may need to compute untrusted bytecode during their
1908 execution. By using pipes or other transports made available to
1909 the process as file descriptors supporting the read/write
1910 syscalls, it's possible to isolate those applications in
1911 their own address space using seccomp. Once seccomp is
1912 enabled via /proc/<pid>/seccomp, it cannot be disabled
1913 and the task is only allowed to execute a few safe syscalls
1914 defined by each seccomp mode.
1915
1916 If unsure, say Y. Only embedded should say N here.
1917
1862endmenu 1918endmenu
1863 1919
1864config RWSEM_GENERIC_SPINLOCK 1920config RWSEM_GENERIC_SPINLOCK
@@ -2025,52 +2081,11 @@ config BINFMT_ELF32
2025 bool 2081 bool
2026 default y if MIPS32_O32 || MIPS32_N32 2082 default y if MIPS32_O32 || MIPS32_N32
2027 2083
2028config SECCOMP 2084endmenu
2029 bool "Enable seccomp to safely compute untrusted bytecode"
2030 depends on PROC_FS && BROKEN
2031 default y
2032 help
2033 This kernel feature is useful for number crunching applications
2034 that may need to compute untrusted bytecode during their
2035 execution. By using pipes or other transports made available to
2036 the process as file descriptors supporting the read/write
2037 syscalls, it's possible to isolate those applications in
2038 their own address space using seccomp. Once seccomp is
2039 enabled via /proc/<pid>/seccomp, it cannot be disabled
2040 and the task is only allowed to execute a few safe syscalls
2041 defined by each seccomp mode.
2042 2085
2043 If unsure, say Y. Only embedded should say N here. 2086menu "Power management options"
2044 2087
2045config PM 2088source "kernel/power/Kconfig"
2046 bool "Power Management support (EXPERIMENTAL)"
2047 depends on EXPERIMENTAL && SOC_AU1X00
2048
2049config APM
2050 tristate "Advanced Power Management Emulation"
2051 depends on PM
2052 ---help---
2053 APM is a BIOS specification for saving power using several different
2054 techniques. This is mostly useful for battery powered systems with
2055 APM compliant BIOSes. If you say Y here, the system time will be
2056 reset after a RESUME operation, the /proc/apm device will provide
2057 battery status information, and user-space programs will receive
2058 notification of APM "events" (e.g. battery status change).
2059
2060 In order to use APM, you will need supporting software. For location
2061 and more information, read <file:Documentation/pm.txt> and the
2062 Battery Powered Linux mini-HOWTO, available from
2063 <http://www.tldp.org/docs.html#howto>.
2064
2065 This driver does not spin down disk drives (see the hdparm(8)
2066 manpage ("man 8 hdparm") for that), and it doesn't turn off
2067 VESA-compliant "green" monitors.
2068
2069 Generally, if you don't have a battery in your machine, there isn't
2070 much point in using this driver and you should say N. If you get
2071 random kernel OOPSes or reboots that don't seem to be related to
2072 anything, try disabling/enabling this option (or disabling/enabling
2073 APM in your BIOS).
2074 2089
2075endmenu 2090endmenu
2076 2091