Merge tag 'mips_4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips

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

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 5d3284d..350a990 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -65,7 +65,7 @@ config MIPS
        select HAVE_PERF_EVENTS
        select HAVE_REGS_AND_STACK_ACCESS_API
        select HAVE_SYSCALL_TRACEPOINTS
-       select HAVE_VIRT_CPU_ACCOUNTING_GEN
+       select HAVE_VIRT_CPU_ACCOUNTING_GEN if 64BIT || !SMP
        select IRQ_FORCED_THREADING
        select MODULES_USE_ELF_RELA if MODULES && 64BIT
        select MODULES_USE_ELF_REL if MODULES
@@ -78,7 +78,7 @@ menu "Machine selection"
 
 choice
        prompt "System type"
-       default SGI_IP22
+       default MIPS_GENERIC
 
 config MIPS_GENERIC
        bool "Generic board-agnostic MIPS kernel"
@@ -233,6 +233,7 @@ config BMIPS_GENERIC
        select USB_EHCI_BIG_ENDIAN_MMIO if CPU_BIG_ENDIAN
        select USB_OHCI_BIG_ENDIAN_DESC if CPU_BIG_ENDIAN
        select USB_OHCI_BIG_ENDIAN_MMIO if CPU_BIG_ENDIAN
+       select HARDIRQS_SW_RESEND
        help
          Build a generic DT-based kernel image that boots on select
          BCM33xx cable modem chips, BCM63xx DSL chips, and BCM7xxx set-top
@@ -276,6 +277,7 @@ config BCM63XX
        select GPIOLIB
        select HAVE_CLK
        select MIPS_L1_CACHE_SHIFT_4
+       select CLKDEV_LOOKUP
        help
         Support for BCM63XX based boards
 
@@ -468,29 +470,6 @@ config MACH_PISTACHIO
        help
          This enables support for the IMG Pistachio SoC platform.
 
-config MACH_XILFPGA
-       bool "MIPSfpga Xilinx based boards"
-       select BOOT_ELF32
-       select BOOT_RAW
-       select BUILTIN_DTB
-       select CEVT_R4K
-       select COMMON_CLK
-       select CSRC_R4K
-       select GPIOLIB
-       select IRQ_MIPS_CPU
-       select LIBFDT
-       select MIPS_CPU_SCACHE
-       select SYS_HAS_EARLY_PRINTK
-       select SYS_HAS_CPU_MIPS32_R2
-       select SYS_SUPPORTS_32BIT_KERNEL
-       select SYS_SUPPORTS_LITTLE_ENDIAN
-       select SYS_SUPPORTS_ZBOOT_UART16550
-       select USE_OF
-       select USE_GENERIC_EARLY_PRINTK_8250
-       select XILINX_INTC
-       help
-         This enables support for the IMG University Program MIPSfpga platform.
-
 config MIPS_MALTA
        bool "MIPS Malta board"
        select ARCH_MAY_HAVE_PC_FDC
@@ -916,7 +895,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
@@ -1034,7 +1014,6 @@ source "arch/mips/loongson32/Kconfig"
 source "arch/mips/loongson64/Kconfig"
 source "arch/mips/netlogic/Kconfig"
 source "arch/mips/paravirt/Kconfig"
-source "arch/mips/xilfpga/Kconfig"
 
 endmenu
 
@@ -2726,6 +2705,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
 #