leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

riscv: simplify Kconfig magic for 32-bit vs 64-bit kernels

Browse Source 
We can deduct this directly using a select from ARCH_RV32I/ARCH_RV64I.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Palmer Dabbelt <palmer@sifive.com>
This commit is contained in:
Christoph Hellwig 2018-04-27 08:38:23 +02:00
parent d0c8ba40c6
commit c3e4ed012b
1 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
arch/riscv/Kconfig
View File

@ -3,6 +3,12 @@
# see Documentation/kbuild/kconfig-language.txt. # see Documentation/kbuild/kconfig-language.txt.
# #
config 64BIT
bool
config 32BIT
bool
config RISCV config RISCV
def_bool y def_bool y
# even on 32-bit, physical (and DMA) addresses are > 32-bits # even on 32-bit, physical (and DMA) addresses are > 32-bits
@ -95,7 +101,6 @@ choice
config ARCH_RV32I config ARCH_RV32I
bool "RV32I" bool "RV32I"
select CPU_SUPPORTS_32BIT_KERNEL
select 32BIT select 32BIT
select GENERIC_ASHLDI3 select GENERIC_ASHLDI3
select GENERIC_ASHRDI3 select GENERIC_ASHRDI3
@ -103,7 +108,6 @@ config ARCH_RV32I
config ARCH_RV64I config ARCH_RV64I
bool "RV64I" bool "RV64I"
select CPU_SUPPORTS_64BIT_KERNEL
select 64BIT select 64BIT
select HAVE_FUNCTION_TRACER select HAVE_FUNCTION_TRACER
select HAVE_FUNCTION_GRAPH_TRACER select HAVE_FUNCTION_GRAPH_TRACER
@ -165,11 +169,6 @@ config NR_CPUS
depends on SMP depends on SMP
default "8" default "8"
config CPU_SUPPORTS_32BIT_KERNEL
bool
config CPU_SUPPORTS_64BIT_KERNEL
bool
choice choice
prompt "CPU Tuning" prompt "CPU Tuning"
default TUNE_GENERIC default TUNE_GENERIC
@ -196,24 +195,6 @@ endmenu
menu "Kernel type" 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 "mm/Kconfig"
source "kernel/Kconfig.preempt" source "kernel/Kconfig.preempt"