Merge tag 'riscv-for-linus-4.20-mw2' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / arch / riscv / Kconfig

diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index a344980287a519eec038d553c8ae4d0f82add8e3..55da93f4e818e22ff1918aa625a56dde5bc56019 100644 (file)
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -28,13 +28,12 @@ config RISCV
        select GENERIC_STRNLEN_USER
        select GENERIC_SMP_IDLE_THREAD
        select GENERIC_ATOMIC64 if !64BIT || !RISCV_ISA_A
-       select HAVE_MEMBLOCK
        select HAVE_MEMBLOCK_NODE_MAP
        select HAVE_DMA_CONTIGUOUS
+       select HAVE_FUTEX_CMPXCHG if FUTEX
        select HAVE_GENERIC_DMA_COHERENT
        select HAVE_PERF_EVENTS
        select IRQ_DOMAIN
-       select NO_BOOTMEM
        select RISCV_ISA_A if SMP
        select SPARSE_IRQ
        select SYSCTL_EXCEPTION_TRACE
@@ -112,6 +111,7 @@ config ARCH_RV32I
 config ARCH_RV64I
        bool "RV64I"
        select 64BIT
+       select ARCH_SUPPORTS_INT128 if GCC_VERSION >= 50000
        select HAVE_FUNCTION_TRACER
        select HAVE_FUNCTION_GRAPH_TRACER
        select HAVE_FTRACE_MCOUNT_RECORD
@@ -208,14 +208,61 @@ config RISCV_BASE_PMU
 
 endmenu
 
+config FPU
+       bool "FPU support"
+       default y
+       help
+         Say N here if you want to disable all floating-point related procedure
+         in the kernel.
+
+         If you don't know what to do here, say Y.
+
 endmenu
 
-menu "Kernel type"
+menu "Kernel features"
 
 source "kernel/Kconfig.hz"
 
 endmenu
 
+menu "Boot options"
+
+config CMDLINE_BOOL
+       bool "Built-in kernel command line"
+       help
+         For most platforms, it is firmware or second stage bootloader
+         that by default specifies the kernel command line options.
+         However, it might be necessary or advantageous to either override
+         the default kernel command line or add a few extra options to it.
+         For such cases, this option allows hardcoding command line options
+         directly into the kernel.
+
+         For that, choose 'Y' here and fill in the extra boot parameters
+         in CONFIG_CMDLINE.
+
+         The built-in options will be concatenated to the default command
+         line if CMDLINE_FORCE is set to 'N'. Otherwise, the default
+         command line will be ignored and replaced by the built-in string.
+
+config CMDLINE
+       string "Built-in kernel command string"
+       depends on CMDLINE_BOOL
+       default ""
+       help
+         Supply command-line options at build time by entering them here.
+
+config CMDLINE_FORCE
+       bool "Built-in command line overrides bootloader arguments"
+       depends on CMDLINE_BOOL
+       help
+         Set this option to 'Y' to have the kernel ignore the bootloader
+         or firmware command line.  Instead, the built-in command line
+         will be used exclusively.
+
+         If you don't know what to do here, say N.
+
+endmenu
+
 menu "Bus support"
 
 config PCI