diff options
Diffstat (limited to 'arch/mips/Kconfig')
-rw-r--r-- | arch/mips/Kconfig | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index a1a088b2d54d..c2917906caaa 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
@@ -132,7 +132,6 @@ config BCM63XX | |||
132 | select IRQ_CPU | 132 | select IRQ_CPU |
133 | select SYS_HAS_CPU_MIPS32_R1 | 133 | select SYS_HAS_CPU_MIPS32_R1 |
134 | select SYS_HAS_CPU_BMIPS4350 if !BCM63XX_CPU_6338 && !BCM63XX_CPU_6345 && !BCM63XX_CPU_6348 | 134 | select SYS_HAS_CPU_BMIPS4350 if !BCM63XX_CPU_6338 && !BCM63XX_CPU_6345 && !BCM63XX_CPU_6348 |
135 | select NR_CPUS_DEFAULT_2 | ||
136 | select SYS_SUPPORTS_32BIT_KERNEL | 135 | select SYS_SUPPORTS_32BIT_KERNEL |
137 | select SYS_SUPPORTS_BIG_ENDIAN | 136 | select SYS_SUPPORTS_BIG_ENDIAN |
138 | select SYS_HAS_EARLY_PRINTK | 137 | select SYS_HAS_EARLY_PRINTK |
@@ -612,7 +611,6 @@ config SIBYTE_SWARM | |||
612 | select BOOT_ELF32 | 611 | select BOOT_ELF32 |
613 | select DMA_COHERENT | 612 | select DMA_COHERENT |
614 | select HAVE_PATA_PLATFORM | 613 | select HAVE_PATA_PLATFORM |
615 | select NR_CPUS_DEFAULT_2 | ||
616 | select SIBYTE_SB1250 | 614 | select SIBYTE_SB1250 |
617 | select SWAP_IO_SPACE | 615 | select SWAP_IO_SPACE |
618 | select SYS_HAS_CPU_SB1 | 616 | select SYS_HAS_CPU_SB1 |
@@ -626,7 +624,6 @@ config SIBYTE_LITTLESUR | |||
626 | select BOOT_ELF32 | 624 | select BOOT_ELF32 |
627 | select DMA_COHERENT | 625 | select DMA_COHERENT |
628 | select HAVE_PATA_PLATFORM | 626 | select HAVE_PATA_PLATFORM |
629 | select NR_CPUS_DEFAULT_2 | ||
630 | select SIBYTE_SB1250 | 627 | select SIBYTE_SB1250 |
631 | select SWAP_IO_SPACE | 628 | select SWAP_IO_SPACE |
632 | select SYS_HAS_CPU_SB1 | 629 | select SYS_HAS_CPU_SB1 |
@@ -638,7 +635,6 @@ config SIBYTE_SENTOSA | |||
638 | bool "Sibyte BCM91250E-Sentosa" | 635 | bool "Sibyte BCM91250E-Sentosa" |
639 | select BOOT_ELF32 | 636 | select BOOT_ELF32 |
640 | select DMA_COHERENT | 637 | select DMA_COHERENT |
641 | select NR_CPUS_DEFAULT_2 | ||
642 | select SIBYTE_SB1250 | 638 | select SIBYTE_SB1250 |
643 | select SWAP_IO_SPACE | 639 | select SWAP_IO_SPACE |
644 | select SYS_HAS_CPU_SB1 | 640 | select SYS_HAS_CPU_SB1 |
@@ -1866,7 +1862,6 @@ config MIPS_MT_SMP | |||
1866 | select CPU_MIPSR2_IRQ_VI | 1862 | select CPU_MIPSR2_IRQ_VI |
1867 | select CPU_MIPSR2_IRQ_EI | 1863 | select CPU_MIPSR2_IRQ_EI |
1868 | select MIPS_MT | 1864 | select MIPS_MT |
1869 | select NR_CPUS_DEFAULT_2 | ||
1870 | select SMP | 1865 | select SMP |
1871 | select SYS_SUPPORTS_SCHED_SMT if SMP | 1866 | select SYS_SUPPORTS_SCHED_SMT if SMP |
1872 | select SYS_SUPPORTS_SMP | 1867 | select SYS_SUPPORTS_SMP |
@@ -2177,12 +2172,6 @@ config SYS_SUPPORTS_MIPS_CMP | |||
2177 | config SYS_SUPPORTS_SMP | 2172 | config SYS_SUPPORTS_SMP |
2178 | bool | 2173 | bool |
2179 | 2174 | ||
2180 | config NR_CPUS_DEFAULT_1 | ||
2181 | bool | ||
2182 | |||
2183 | config NR_CPUS_DEFAULT_2 | ||
2184 | bool | ||
2185 | |||
2186 | config NR_CPUS_DEFAULT_4 | 2175 | config NR_CPUS_DEFAULT_4 |
2187 | bool | 2176 | bool |
2188 | 2177 | ||
@@ -2200,10 +2189,8 @@ config NR_CPUS_DEFAULT_64 | |||
2200 | 2189 | ||
2201 | config NR_CPUS | 2190 | config NR_CPUS |
2202 | int "Maximum number of CPUs (2-64)" | 2191 | int "Maximum number of CPUs (2-64)" |
2203 | range 1 64 if NR_CPUS_DEFAULT_1 | 2192 | range 2 64 |
2204 | depends on SMP | 2193 | depends on SMP |
2205 | default "1" if NR_CPUS_DEFAULT_1 | ||
2206 | default "2" if NR_CPUS_DEFAULT_2 | ||
2207 | default "4" if NR_CPUS_DEFAULT_4 | 2194 | default "4" if NR_CPUS_DEFAULT_4 |
2208 | default "8" if NR_CPUS_DEFAULT_8 | 2195 | default "8" if NR_CPUS_DEFAULT_8 |
2209 | default "16" if NR_CPUS_DEFAULT_16 | 2196 | default "16" if NR_CPUS_DEFAULT_16 |