arch/config: Make RISC-V 64-bits MMU optional

Linux supports No-MMU RISC-V 64-bits since kernel version 5.8. Make
MMU optional to enable building for RISC-V 64-bits boards that do not
have one. MMU use of RISC-V 32-bits builds remains mandatory for now.

Signed-off-by: Damien Le Moal <[email protected]>
Reviewed-by: Alistair Francis <[email protected]>
Signed-off-by: Peter Korsgaard <[email protected]>

diff --git a/arch/Config.in b/arch/Config.in
index d50718e2d4d68babb6d51ff19899fafbc422d75f..c99af89efa034af1c7d26a9781c4ba3cb645b757 100644 (file)
--- a/arch/Config.in
+++ b/arch/Config.in
@@ -209,7 +209,6 @@ config BR2_powerpc64le
 
 config BR2_riscv
        bool "RISCV"
-       select BR2_ARCH_HAS_MMU_MANDATORY
        select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
        help
          RISC-V is an open, free Instruction Set Architecture created

diff --git a/arch/Config.in.riscv b/arch/Config.in.riscv
index 1fc20e5de745caa07bd09f9eb6101988a3789ca2..e6436d7c39c0e8fb25822e8e7d4d5ce7d9847dae 100644 (file)
--- a/arch/Config.in.riscv
+++ b/arch/Config.in.riscv
@@ -71,10 +71,12 @@ choice
 
 config BR2_RISCV_32
        bool "32-bit"
+       select BR2_ARCH_HAS_MMU_MANDATORY
 
 config BR2_RISCV_64
        bool "64-bit"
        select BR2_ARCH_IS_64
+       select BR2_ARCH_HAS_MMU_OPTIONAL
 
 endchoice