MIPS: Kconfig: Set default MIPS system type as generic

[linux-2.6-block.git] / arch / mips / Kconfig

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index cb7fcc4216fdfa5d25e6a76265efc0b66b81e0ad..6d831146cc477e16ed1edeee213a44464ea58d1f 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -77,7 +77,7 @@ menu "Machine selection"
 
 choice
        prompt "System type"
-       default SGI_IP22
+       default MIPS_GENERIC
 
 config MIPS_GENERIC
        bool "Generic board-agnostic MIPS kernel"
@@ -275,6 +275,7 @@ config BCM63XX
        select GPIOLIB
        select HAVE_CLK
        select MIPS_L1_CACHE_SHIFT_4
+       select CLKDEV_LOOKUP
        help
         Support for BCM63XX based boards
 
@@ -915,7 +916,8 @@ config CAVIUM_OCTEON_SOC
        select USE_OF
        select ARCH_SPARSEMEM_ENABLE
        select SYS_SUPPORTS_SMP
-       select NR_CPUS_DEFAULT_16
+       select NR_CPUS_DEFAULT_64
+       select MIPS_NR_CPU_NR_MAP_1024
        select BUILTIN_DTB
        select MTD_COMPLEX_MAPPINGS
        select SYS_SUPPORTS_RELOCATABLE
@@ -2725,6 +2727,15 @@ config NR_CPUS
 config MIPS_PERF_SHARED_TC_COUNTERS
        bool
 
+config MIPS_NR_CPU_NR_MAP_1024
+       bool
+
+config MIPS_NR_CPU_NR_MAP
+       int
+       depends on SMP
+       default 1024 if MIPS_NR_CPU_NR_MAP_1024
+       default NR_CPUS if !MIPS_NR_CPU_NR_MAP_1024
+
 #
 # Timer Interrupt Frequency Configuration
 #