Merge tag 'kconfig-v4.21-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiro...

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

diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index 55da93f4e818e22ff1918aa625a56dde5bc56019..e0d7d61779a6cd7f13b1a12ac742ab1d4d9147ed 100644 (file)
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -19,11 +19,11 @@ config RISCV
        select ARCH_WANT_FRAME_POINTERS
        select CLONE_BACKWARDS
        select COMMON_CLK
-       select DMA_DIRECT_OPS
        select GENERIC_CLOCKEVENTS
        select GENERIC_CPU_DEVICES
        select GENERIC_IRQ_SHOW
        select GENERIC_PCI_IOMAP
+       select GENERIC_SCHED_CLOCK
        select GENERIC_STRNCPY_FROM_USER
        select GENERIC_STRNLEN_USER
        select GENERIC_SMP_IDLE_THREAD
@@ -38,8 +38,11 @@ config RISCV
        select SPARSE_IRQ
        select SYSCTL_EXCEPTION_TRACE
        select HAVE_ARCH_TRACEHOOK
+       select HAVE_PCI
        select MODULES_USE_ELF_RELA if MODULES
        select THREAD_INFO_IN_TASK
+       select PCI_DOMAINS_GENERIC if PCI
+       select PCI_MSI if PCI
        select RISCV_TIMER
        select GENERIC_IRQ_MULTI_HANDLER
        select ARCH_HAS_PTE_SPECIAL
@@ -227,66 +230,53 @@ endmenu
 
 menu "Boot options"
 
-config CMDLINE_BOOL
-       bool "Built-in kernel command line"
+config CMDLINE
+       string "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.
+         For most platforms, the arguments for the kernel's command line
+         are provided at run-time, during boot. However, there are cases
+         where either no arguments are being provided or the provided
+         arguments are insufficient or even invalid.
 
-         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.
+         When that occurs, it is possible to define a built-in command
+         line here and choose how the kernel should use it later on.
 
-config CMDLINE
-       string "Built-in kernel command string"
-       depends on CMDLINE_BOOL
-       default ""
+choice
+       prompt "Built-in command line usage" if CMDLINE != ""
+       default CMDLINE_FALLBACK
        help
-         Supply command-line options at build time by entering them here.
+         Choose how the kernel will handle the provided built-in command
+         line.
 
-config CMDLINE_FORCE
-       bool "Built-in command line overrides bootloader arguments"
-       depends on CMDLINE_BOOL
+config CMDLINE_FALLBACK
+       bool "Use bootloader kernel arguments if available"
        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.
+         Use the built-in command line as fallback in case we get nothing
+         during boot. This is the default behaviour.
 
-endmenu
-
-menu "Bus support"
-
-config PCI
-       bool "PCI support"
-       select PCI_MSI
+config CMDLINE_EXTEND
+       bool "Extend bootloader kernel arguments"
        help
-         This feature enables support for PCI bus system. If you say Y
-         here, the kernel will include drivers and infrastructure code
-         to support PCI bus devices.
-
-         If you don't know what to do here, say Y.
+         The command-line arguments provided during boot will be
+         appended to the built-in command line. This is useful in
+         cases where the provided arguments are insufficient and
+         you don't want to or cannot modify them.
 
-config PCI_DOMAINS
-       def_bool PCI
 
-config PCI_DOMAINS_GENERIC
-       def_bool PCI
+config CMDLINE_FORCE
+       bool "Always use the default kernel command string"
+       help
+         Always use the built-in command line, even if we get one during
+         boot. This is useful in case you need to override the provided
+         command line on systems where you don't have or want control
+         over it.
 
-source "drivers/pci/Kconfig"
+endchoice
 
 endmenu
 
 menu "Power management options"
 
-source kernel/power/Kconfig
+source "kernel/power/Kconfig"
 
 endmenu