This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new d1a634db21e arch/risc-v: move NuttSBI into sbi directory
d1a634db21e is described below
commit d1a634db21ee212820bf809706a3866fb11d0865
Author: Zhouqi Jiang <[email protected]>
AuthorDate: Sun Nov 15 22:48:27 2026 +0800
arch/risc-v: move NuttSBI into sbi directory
Move the native NuttSBI implementation under a generic SBI directory and
update the Make, CMake, and Kconfig references. Keep CONFIG_NUTTSBI and the
implementation behavior unchanged.
Assisted-by: Codex:gpt-6.1-terra
Signed-off-by: Zhouqi Jiang <[email protected]>
---
arch/risc-v/Kconfig | 2 +-
arch/risc-v/src/CMakeLists.txt | 4 ++--
arch/risc-v/src/Makefile | 2 +-
arch/risc-v/src/{nuttsbi => sbi}/CMakeLists.txt | 2 +-
arch/risc-v/src/{nuttsbi => sbi}/Kconfig | 0
arch/risc-v/src/{nuttsbi => sbi}/Make.defs | 6 +++---
arch/risc-v/src/{nuttsbi => sbi}/sbi_head.S | 2 +-
arch/risc-v/src/{nuttsbi => sbi}/sbi_internal.h | 8 ++++----
arch/risc-v/src/{nuttsbi => sbi}/sbi_ipi.c | 2 +-
arch/risc-v/src/{nuttsbi => sbi}/sbi_mcall.c | 0
arch/risc-v/src/{nuttsbi => sbi}/sbi_mcall.h | 2 +-
arch/risc-v/src/{nuttsbi => sbi}/sbi_mexception.c | 2 +-
arch/risc-v/src/{nuttsbi => sbi}/sbi_mscratch.c | 2 +-
arch/risc-v/src/{nuttsbi => sbi}/sbi_mtimer.c | 2 +-
arch/risc-v/src/{nuttsbi => sbi}/sbi_mtrap.S | 2 +-
arch/risc-v/src/{nuttsbi => sbi}/sbi_start.c | 0
arch/risc-v/src/{nuttsbi => sbi}/sbi_vectors.S | 2 +-
17 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/arch/risc-v/Kconfig b/arch/risc-v/Kconfig
index d672d30e511..c00d97276f5 100644
--- a/arch/risc-v/Kconfig
+++ b/arch/risc-v/Kconfig
@@ -982,7 +982,7 @@ endchoice # LITEX Core Selection
endif # ARCH_CHIP_LITEX
source "arch/risc-v/src/opensbi/Kconfig"
-source "arch/risc-v/src/nuttsbi/Kconfig"
+source "arch/risc-v/src/sbi/Kconfig"
if ARCH_CHIP_FE310
source "arch/risc-v/src/fe310/Kconfig"
diff --git a/arch/risc-v/src/CMakeLists.txt b/arch/risc-v/src/CMakeLists.txt
index 7c5b9760ce2..2e0b4192764 100644
--- a/arch/risc-v/src/CMakeLists.txt
+++ b/arch/risc-v/src/CMakeLists.txt
@@ -24,8 +24,8 @@ add_subdirectory(${NUTTX_CHIP_ABS_DIR} exclude_chip
EXCLUDE_FROM_ALL)
add_subdirectory(common)
if(CONFIG_BUILD_KERNEL)
- add_subdirectory(nuttsbi)
- target_include_directories(arch BEFORE PUBLIC ${NUTTX_CHIP_ABS_DIR} nuttsbi)
+ add_subdirectory(sbi)
+ target_include_directories(arch BEFORE PUBLIC ${NUTTX_CHIP_ABS_DIR} sbi)
endif()
# Include directories (before system ones) as PUBLIC so that it can be exposed
diff --git a/arch/risc-v/src/Makefile b/arch/risc-v/src/Makefile
index 055c057f7a2..7864e675013 100644
--- a/arch/risc-v/src/Makefile
+++ b/arch/risc-v/src/Makefile
@@ -25,7 +25,7 @@ include chip/Make.defs
ifeq ($(CONFIG_OPENSBI),y)
include opensbi/Make.defs
else ifeq ($(CONFIG_NUTTSBI),y)
-include nuttsbi/Make.defs
+include sbi/Make.defs
endif
ARCH_SRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src
diff --git a/arch/risc-v/src/nuttsbi/CMakeLists.txt
b/arch/risc-v/src/sbi/CMakeLists.txt
similarity index 96%
rename from arch/risc-v/src/nuttsbi/CMakeLists.txt
rename to arch/risc-v/src/sbi/CMakeLists.txt
index 9f3665c0b8a..69bb3c2cdb9 100644
--- a/arch/risc-v/src/nuttsbi/CMakeLists.txt
+++ b/arch/risc-v/src/sbi/CMakeLists.txt
@@ -1,5 +1,5 @@
#
##############################################################################
-# arch/risc-v/src/nuttsbi/CMakeLists.txt
+# arch/risc-v/src/sbi/CMakeLists.txt
#
# SPDX-License-Identifier: Apache-2.0
#
diff --git a/arch/risc-v/src/nuttsbi/Kconfig b/arch/risc-v/src/sbi/Kconfig
similarity index 100%
rename from arch/risc-v/src/nuttsbi/Kconfig
rename to arch/risc-v/src/sbi/Kconfig
diff --git a/arch/risc-v/src/nuttsbi/Make.defs b/arch/risc-v/src/sbi/Make.defs
similarity index 91%
rename from arch/risc-v/src/nuttsbi/Make.defs
rename to arch/risc-v/src/sbi/Make.defs
index d11f9bd55ab..35ea232a9d3 100644
--- a/arch/risc-v/src/nuttsbi/Make.defs
+++ b/arch/risc-v/src/sbi/Make.defs
@@ -1,5 +1,5 @@
############################################################################
-# arch/risc-v/src/nuttsbi/Make.defs
+# arch/risc-v/src/sbi/Make.defs
#
# SPDX-License-Identifier: Apache-2.0
#
@@ -28,8 +28,8 @@ SBI_ASRCS += sbi_mtrap.S sbi_vectors.S sbi_head.S
SBI_CSRCS += sbi_mscratch.c sbi_mcall.c sbi_start.c
SBI_CSRCS += sbi_mexception.c sbi_mtimer.c sbi_ipi.c
-INCLUDES += ${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)nuttsbi
+INCLUDES += ${INCDIR_PREFIX}$(ARCH_SRCDIR)$(DELIM)sbi
-SBI_DIR := nuttsbi
+SBI_DIR := sbi
endif
diff --git a/arch/risc-v/src/nuttsbi/sbi_head.S b/arch/risc-v/src/sbi/sbi_head.S
similarity index 98%
rename from arch/risc-v/src/nuttsbi/sbi_head.S
rename to arch/risc-v/src/sbi/sbi_head.S
index 6f742b065ed..bca1fd379e4 100644
--- a/arch/risc-v/src/nuttsbi/sbi_head.S
+++ b/arch/risc-v/src/sbi/sbi_head.S
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/risc-v/src/nuttsbi/sbi_head.S
+ * arch/risc-v/src/sbi/sbi_head.S
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/arch/risc-v/src/nuttsbi/sbi_internal.h
b/arch/risc-v/src/sbi/sbi_internal.h
similarity index 96%
rename from arch/risc-v/src/nuttsbi/sbi_internal.h
rename to arch/risc-v/src/sbi/sbi_internal.h
index dcdab77bc68..628f7fe3779 100644
--- a/arch/risc-v/src/nuttsbi/sbi_internal.h
+++ b/arch/risc-v/src/sbi/sbi_internal.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/risc-v/src/nuttsbi/sbi_internal.h
+ * arch/risc-v/src/sbi/sbi_internal.h
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -20,8 +20,8 @@
*
****************************************************************************/
-#ifndef __ARCH_RISC_V_SRC_NUTTSBI_SBI_INTERNAL_H
-#define __ARCH_RISC_V_SRC_NUTTSBI_SBI_INTERNAL_H
+#ifndef __ARCH_RISC_V_SRC_SBI_SBI_INTERNAL_H
+#define __ARCH_RISC_V_SRC_SBI_SBI_INTERNAL_H
/****************************************************************************
* Included Files
@@ -176,4 +176,4 @@ void sbi_late_initialize(void);
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_RISC_V_SRC_NUTTSBI_SBI_INTERNAL_H */
+#endif /* __ARCH_RISC_V_SRC_SBI_SBI_INTERNAL_H */
diff --git a/arch/risc-v/src/nuttsbi/sbi_ipi.c b/arch/risc-v/src/sbi/sbi_ipi.c
similarity index 98%
rename from arch/risc-v/src/nuttsbi/sbi_ipi.c
rename to arch/risc-v/src/sbi/sbi_ipi.c
index e4e9276d6b8..d2b4e804267 100644
--- a/arch/risc-v/src/nuttsbi/sbi_ipi.c
+++ b/arch/risc-v/src/sbi/sbi_ipi.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/risc-v/src/nuttsbi/sbi_ipi.c
+ * arch/risc-v/src/sbi/sbi_ipi.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/arch/risc-v/src/nuttsbi/sbi_mcall.c
b/arch/risc-v/src/sbi/sbi_mcall.c
similarity index 100%
rename from arch/risc-v/src/nuttsbi/sbi_mcall.c
rename to arch/risc-v/src/sbi/sbi_mcall.c
diff --git a/arch/risc-v/src/nuttsbi/sbi_mcall.h
b/arch/risc-v/src/sbi/sbi_mcall.h
similarity index 97%
rename from arch/risc-v/src/nuttsbi/sbi_mcall.h
rename to arch/risc-v/src/sbi/sbi_mcall.h
index f407df3ec53..361030f38a1 100644
--- a/arch/risc-v/src/nuttsbi/sbi_mcall.h
+++ b/arch/risc-v/src/sbi/sbi_mcall.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/risc-v/src/nuttsbi/sbi_mcall.h
+ * arch/risc-v/src/sbi/sbi_mcall.h
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/arch/risc-v/src/nuttsbi/sbi_mexception.c
b/arch/risc-v/src/sbi/sbi_mexception.c
similarity index 97%
rename from arch/risc-v/src/nuttsbi/sbi_mexception.c
rename to arch/risc-v/src/sbi/sbi_mexception.c
index fda114cfad8..9ba65542188 100644
--- a/arch/risc-v/src/nuttsbi/sbi_mexception.c
+++ b/arch/risc-v/src/sbi/sbi_mexception.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/risc-v/src/nuttsbi/sbi_mexception.c
+ * arch/risc-v/src/sbi/sbi_mexception.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/arch/risc-v/src/nuttsbi/sbi_mscratch.c
b/arch/risc-v/src/sbi/sbi_mscratch.c
similarity index 98%
rename from arch/risc-v/src/nuttsbi/sbi_mscratch.c
rename to arch/risc-v/src/sbi/sbi_mscratch.c
index 672c7ef2010..97a72269017 100644
--- a/arch/risc-v/src/nuttsbi/sbi_mscratch.c
+++ b/arch/risc-v/src/sbi/sbi_mscratch.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/risc-v/src/nuttsbi/sbi_mscratch.c
+ * arch/risc-v/src/sbi/sbi_mscratch.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/arch/risc-v/src/nuttsbi/sbi_mtimer.c
b/arch/risc-v/src/sbi/sbi_mtimer.c
similarity index 98%
rename from arch/risc-v/src/nuttsbi/sbi_mtimer.c
rename to arch/risc-v/src/sbi/sbi_mtimer.c
index efcd3d365ef..a41cb1d2eb0 100644
--- a/arch/risc-v/src/nuttsbi/sbi_mtimer.c
+++ b/arch/risc-v/src/sbi/sbi_mtimer.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/risc-v/src/nuttsbi/sbi_mtimer.c
+ * arch/risc-v/src/sbi/sbi_mtimer.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/arch/risc-v/src/nuttsbi/sbi_mtrap.S
b/arch/risc-v/src/sbi/sbi_mtrap.S
similarity index 99%
rename from arch/risc-v/src/nuttsbi/sbi_mtrap.S
rename to arch/risc-v/src/sbi/sbi_mtrap.S
index 847895ad003..3687176dfdc 100644
--- a/arch/risc-v/src/nuttsbi/sbi_mtrap.S
+++ b/arch/risc-v/src/sbi/sbi_mtrap.S
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/risc-v/src/nuttsbi/sbi_machine_trap.S
+ * arch/risc-v/src/sbi/sbi_machine_trap.S
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/arch/risc-v/src/nuttsbi/sbi_start.c
b/arch/risc-v/src/sbi/sbi_start.c
similarity index 100%
rename from arch/risc-v/src/nuttsbi/sbi_start.c
rename to arch/risc-v/src/sbi/sbi_start.c
diff --git a/arch/risc-v/src/nuttsbi/sbi_vectors.S
b/arch/risc-v/src/sbi/sbi_vectors.S
similarity index 96%
rename from arch/risc-v/src/nuttsbi/sbi_vectors.S
rename to arch/risc-v/src/sbi/sbi_vectors.S
index 61f144eeb57..330bb8d31df 100644
--- a/arch/risc-v/src/nuttsbi/sbi_vectors.S
+++ b/arch/risc-v/src/sbi/sbi_vectors.S
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/risc-v/src/nuttsbi/sbi_machine_vectors.S
+ * arch/risc-v/src/sbi/sbi_machine_vectors.S
*
* SPDX-License-Identifier: Apache-2.0
*