This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
from 7c99bce Added registering logic SPI on /dev.
new 8b66280 arch/risc-v: Update outdated comments
new cfed970 arch/misoc: Correct gurad macro for irq.h
new e855215 arch/risc-v: Remove unneeded ISA specifc interface
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
arch/README.txt | 4 +---
arch/misoc/include/minerva/irq.h | 6 +++---
arch/risc-v/include/arch.h | 21 ---------------------
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 +-
8 files changed, 9 insertions(+), 41 deletions(-)
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit cfed970633cbbce13cd88b7f786724b90660ba56
Author: Huang Qi <hu...@xiaomi.com>
AuthorDate: Fri Feb 25 15:26:07 2022 +0800
arch/misoc: Correct gurad macro for irq.h
Signed-off-by: Huang Qi <hu...@xiaomi.com>
---
arch/misoc/include/minerva/irq.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/misoc/include/minerva/irq.h b/arch/misoc/include/minerva/irq.h
index 079238a..4b81cec 100644
--- a/arch/misoc/include/minerva/irq.h
+++ b/arch/misoc/include/minerva/irq.h
@@ -22,8 +22,8 @@
* through nuttx/irq.h
*/
-#ifndef __ARCH_MINERVA_INCLUDE_IRQ_H
-#define __ARCH_MINERVA_INCLUDE_IRQ_H
+#ifndef __ARCH_MISOC_INCLUDE_MINERVA_IRQ_H
+#define __ARCH_MISOC_INCLUDE_MINERVA_IRQ_H
/****************************************************************************
* Included Files
@@ -306,4 +306,4 @@ struct xcptcontext
****************************************************************************/
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_RISCV_INCLUDE_RV32IM_IRQ_H */
+#endif /* __ARCH_MISOC_INCLUDE_MINERVA_IRQ_H */
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit e8552156b6ba846fd07c02020a6a492ba9123a83
Author: Huang Qi <hu...@xiaomi.com>
AuthorDate: Fri Feb 25 15:37:26 2022 +0800
arch/risc-v: Remove unneeded ISA specifc interface
They are not really defined and used in any where:
uint32_t up_getmisa(void);
uint32_t up_getarchid(void);
uint32_t up_getimpid(void);
uint32_t up_getvendorid(void);
uint32_t up_gethartid(void);
Signed-off-by: Huang Qi <hu...@xiaomi.com>
---
arch/risc-v/include/arch.h | 21 ---------------------
1 file changed, 21 deletions(-)
diff --git a/arch/risc-v/include/arch.h b/arch/risc-v/include/arch.h
index 62f19e7..92b1f66 100644
--- a/arch/risc-v/include/arch.h
+++ b/arch/risc-v/include/arch.h
@@ -41,27 +41,6 @@
* Pre-processor Definitions
****************************************************************************/
-/* Macros to get the core and vendor ID, HART, arch and ISA codes, etc.
- */
-
-#ifdef CONFIG_RV32IM_SYSTEM_CSRRS_SUPPORT
-
-uint32_t up_getmisa(void);
-uint32_t up_getarchid(void);
-uint32_t up_getimpid(void);
-uint32_t up_getvendorid(void);
-uint32_t up_gethartid(void);
-
-#else
-
-#define up_getmisa() 0
-#define up_getarchid() 0
-#define up_getimpid() 0
-#define up_getvendorid() 0
-#define up_gethartid() 0
-
-#endif
-
/****************************************************************************
* Inline functions
****************************************************************************/
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 8b66280b4f5a659588bbb0251cb2c36a05f07517
Author: Huang Qi <hu...@xiaomi.com>
AuthorDate: Fri Feb 25 15:21:41 2022 +0800
arch/risc-v: Update outdated comments
Signed-off-by: Huang Qi <hu...@xiaomi.com>
---
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 a60ec48..573c42b 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 e5e15a1..b59be33 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 bd535c7..f598c6f 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 61e68dd..35b7660 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 ac6ecd5..df3d4a7 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 06d4ab9..6f93f60 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:
*