Merge tag 'for-linus-4.18-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index 4495604..f12680c 100644 (file)
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -3,8 +3,16 @@
 # see Documentation/kbuild/kconfig-language.txt.
 #
 
+config 64BIT
+       bool
+
+config 32BIT
+       bool
+
 config RISCV
        def_bool y
+       # even on 32-bit, physical (and DMA) addresses are > 32-bits
+       select PHYS_ADDR_T_64BIT
        select OF
        select OF_EARLY_FLATTREE
        select OF_IRQ
@@ -22,7 +30,6 @@ config RISCV
        select GENERIC_ATOMIC64 if !64BIT || !RISCV_ISA_A
        select HAVE_MEMBLOCK
        select HAVE_MEMBLOCK_NODE_MAP
-       select HAVE_DMA_API_DEBUG
        select HAVE_DMA_CONTIGUOUS
        select HAVE_GENERIC_DMA_COHERENT
        select HAVE_PERF_EVENTS
@@ -36,20 +43,14 @@ config RISCV
        select THREAD_INFO_IN_TASK
        select RISCV_TIMER
        select GENERIC_IRQ_MULTI_HANDLER
+       select ARCH_HAS_PTE_SPECIAL
 
 config MMU
        def_bool y
 
-# even on 32-bit, physical (and DMA) addresses are > 32-bits
-config ARCH_PHYS_ADDR_T_64BIT
-       def_bool y
-
 config ZONE_DMA32
        bool
-       default y
-
-config ARCH_DMA_ADDR_T_64BIT
-       def_bool y
+       default y if 64BIT
 
 config PAGE_OFFSET
        hex
@@ -102,21 +103,20 @@ choice
 
 config ARCH_RV32I
        bool "RV32I"
-       select CPU_SUPPORTS_32BIT_KERNEL
        select 32BIT
-       select GENERIC_ASHLDI3
-       select GENERIC_ASHRDI3
-       select GENERIC_LSHRDI3
+       select GENERIC_LIB_ASHLDI3
+       select GENERIC_LIB_ASHRDI3
+       select GENERIC_LIB_LSHRDI3
 
 config ARCH_RV64I
        bool "RV64I"
-       select CPU_SUPPORTS_64BIT_KERNEL
        select 64BIT
        select HAVE_FUNCTION_TRACER
        select HAVE_FUNCTION_GRAPH_TRACER
        select HAVE_FTRACE_MCOUNT_RECORD
        select HAVE_DYNAMIC_FTRACE
        select HAVE_DYNAMIC_FTRACE_WITH_REGS
+       select SWIOTLB
 
 endchoice
 
@@ -172,11 +172,6 @@ config NR_CPUS
        depends on SMP
        default "8"
 
-config CPU_SUPPORTS_32BIT_KERNEL
-       bool
-config CPU_SUPPORTS_64BIT_KERNEL
-       bool
-
 choice
        prompt "CPU Tuning"
        default TUNE_GENERIC
@@ -216,24 +211,6 @@ endmenu
 
 menu "Kernel type"
 
-choice
-       prompt "Kernel code model"
-       default 64BIT
-
-config 32BIT
-       bool "32-bit kernel"
-       depends on CPU_SUPPORTS_32BIT_KERNEL
-       help
-         Select this option to build a 32-bit kernel.
-
-config 64BIT
-       bool "64-bit kernel"
-       depends on CPU_SUPPORTS_64BIT_KERNEL
-       help
-         Select this option to build a 64-bit kernel.
-
-endchoice
-
 source "mm/Kconfig"
 
 source "kernel/Kconfig.preempt"