Merge tag 'asm-generic-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd...

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

diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index 792a337548f660f807d27ce99e7146fa23c9a1b8..d2c257a0da2ac082d8bfcac827f4bc0514afeefb 100644 (file)
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -316,7 +316,6 @@ config AS_HAS_OPTION_ARCH
        # https://reviews.llvm.org/D123515
        def_bool y
        depends on $(as-instr, .option arch$(comma) +m)
-       depends on !$(as-instr, .option arch$(comma) -i)
 
 source "arch/riscv/Kconfig.socs"
 source "arch/riscv/Kconfig.errata"
@@ -984,7 +983,19 @@ config RISCV_ISA_FALLBACK
 config BUILTIN_DTB
        bool "Built-in device tree"
        depends on OF && NONPORTABLE
-       default y if XIP_KERNEL
+       help
+         Build a device tree into the Linux image.
+         This option should be selected if no bootloader is being used.
+         If unsure, say N.
+
+
+config BUILTIN_DTB_SOURCE
+       string "Built-in device tree source"
+       depends on BUILTIN_DTB
+       help
+         DTS file path (without suffix, relative to arch/riscv/boot/dts)
+         for the DTS file that will be used to produce the DTB linked into the
+         kernel.
 
 endmenu # "Boot options"