From 8b66280b4f5a659588bbb0251cb2c36a05f07517 Mon Sep 17 00:00:00 2001 From: Huang Qi Date: Fri, 25 Feb 2022 15:21:41 +0800 Subject: [PATCH] arch/risc-v: Update outdated comments Signed-off-by: Huang Qi --- arch/README.txt | 4 +--- arch/risc-v/include/syscall.h | 2 +- arch/risc-v/src/Makefile | 9 --------- arch/risc-v/src/common/riscv_signal_dispatch.c | 4 ++-- arch/risc-v/src/common/riscv_signal_handler.S | 2 +- arch/risc-v/src/common/svcall.h | 2 +- 6 files changed, 6 insertions(+), 17 deletions(-) diff --git a/arch/README.txt b/arch/README.txt index a60ec48e1e..573c42b8e3 100644 --- a/arch/README.txt +++ b/arch/README.txt @@ -250,14 +250,12 @@ arch/risc-v This directory is dedicated to ports to the RISC-V family. Architecture Support - arch/risc-v/include/rv32im + arch/risc-v/include and arch/risc-v/common MCU support arch/risc-v/include/fe310 and arch/risc-v/src/fe310 arch/risc-v/include/k210 and arch/risc-v/src/k210 arch/risc-v/include/litex and arch/risc-v/src/litex - arch/risc-v/include/rv32im and arch/risc-v/src/rv32im - arch/risc-v/include/rv64gc and arch/risc-v/src/rv64gc arch/x86 - Intel x86 architectures This directory holds related, 32- and 64-bit architectures from diff --git a/arch/risc-v/include/syscall.h b/arch/risc-v/include/syscall.h index e5e15a1dcc..b59be33cd4 100644 --- a/arch/risc-v/include/syscall.h +++ b/arch/risc-v/include/syscall.h @@ -54,7 +54,7 @@ /* Configuration ************************************************************/ /* SYS call 1 and 2 are defined for internal use by the RISC-V port (see - * arch/risc-v/include/rv64gc/syscall.h). In addition, SYS call 3 is the + * arch/risc-v/include/syscall.h). In addition, SYS call 3 is the * return from a SYS call in kernel mode. The first four syscall values must, * therefore, be reserved (0 is not used). */ diff --git a/arch/risc-v/src/Makefile b/arch/risc-v/src/Makefile index bd535c7c86..f598c6fd2e 100644 --- a/arch/risc-v/src/Makefile +++ b/arch/risc-v/src/Makefile @@ -24,19 +24,10 @@ ifeq ($(CONFIG_OPENSBI),y) include opensbi/Make.defs endif -# TODO: Merge these implementaions into one - -ifeq ($(CONFIG_ARCH_RV32),y) -ARCH_SUBDIR = rv32im -else ifeq ($(CONFIG_ARCH_RV64),y) -ARCH_SUBDIR = rv64gc -endif - ARCH_SRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)chip} INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)common} -INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)$(ARCH_SUBDIR)} INCLUDES += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)sched} ifeq ($(CONFIG_OPENSBI),y) INCLUDES += $(shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)opensbi$(DELIM)opensbi-3rdparty$(DELIM)include) diff --git a/arch/risc-v/src/common/riscv_signal_dispatch.c b/arch/risc-v/src/common/riscv_signal_dispatch.c index 61e68dd31b..35b76604c0 100644 --- a/arch/risc-v/src/common/riscv_signal_dispatch.c +++ b/arch/risc-v/src/common/riscv_signal_dispatch.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/risc-v/src/rv64gc/riscv_signal_dispatch.c + * arch/risc-v/src/common/riscv_signal_dispatch.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -46,7 +46,7 @@ * * Normally the user-mode signaling handling stub will also execute * before the ultimate signal handler is called. See - * arch/risc-v/src/rv64gc/up_signal_handler.S. This function is the + * arch/risc-v/src/common/riscv_signal_handler.S. This function is the * user-space, signal handler trampoline function. It is called from * up_signal_dispatch() in user-mode. * diff --git a/arch/risc-v/src/common/riscv_signal_handler.S b/arch/risc-v/src/common/riscv_signal_handler.S index ac6ecd5681..df3d4a7cb5 100644 --- a/arch/risc-v/src/common/riscv_signal_handler.S +++ b/arch/risc-v/src/common/riscv_signal_handler.S @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/risc-v/src/rv64gc/riscv_signal_handler.S + * arch/risc-v/src/common/riscv_signal_handler.S * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/arch/risc-v/src/common/svcall.h b/arch/risc-v/src/common/svcall.h index 06d4ab9dec..6f93f60077 100644 --- a/arch/risc-v/src/common/svcall.h +++ b/arch/risc-v/src/common/svcall.h @@ -59,7 +59,7 @@ # endif #endif -/* RV64GC system calls ******************************************************/ +/* RISC-V system calls ******************************************************/ /* SYS call 0: *