From e32d404f6c4fb5fce2a65996efac53281f97ce5c Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 12 May 2024 12:06:27 +0200 Subject: [PATCH] arch: allow riscv32 noMMU configuration Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni --- arch/Config.in.riscv | 2 -- package/Makefile.in | 8 ++++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/arch/Config.in.riscv b/arch/Config.in.riscv index d62e4ebc6c..23d095d1a6 100644 --- a/arch/Config.in.riscv +++ b/arch/Config.in.riscv @@ -51,7 +51,6 @@ choice config BR2_RISCV_32 bool "32-bit" - select BR2_USE_MMU config BR2_RISCV_64 bool "64-bit" @@ -62,7 +61,6 @@ endchoice config BR2_RISCV_USE_MMU bool "MMU support" default y - depends on BR2_RISCV_64 select BR2_USE_MMU help Enable this option if your RISC-V core has a MMU (Memory diff --git a/package/Makefile.in b/package/Makefile.in index b350c4b7b5..f415e55f84 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -41,9 +41,9 @@ endif # Compute GNU_TARGET_NAME GNU_TARGET_NAME = $(ARCH)-$(TARGET_VENDOR)-$(TARGET_OS)-$(LIBC)$(ABI) -# FLAT binary format needs uclinux, except RISC-V 64-bits which needs -# the regular linux name. -ifeq ($(BR2_BINFMT_FLAT):$(BR2_RISCV_64),y:) +# FLAT binary format needs uclinux, except RISC-V which needs the +# regular linux name. +ifeq ($(BR2_BINFMT_FLAT):$(BR2_riscv),y:) TARGET_OS = uclinux else TARGET_OS = linux @@ -181,7 +181,7 @@ TARGET_CXXFLAGS += -fno-dwarf2-cfi-asm endif ifeq ($(BR2_BINFMT_FLAT),y) -ifeq ($(BR2_RISCV_64),y) +ifeq ($(BR2_riscv),y) TARGET_CFLAGS += -fPIC endif ELF2FLT_FLAGS = $(if $($(PKG)_FLAT_STACKSIZE),\