24 files changed, 22 insertions, 22 deletions
diff --git a/bsps/riscv/riscv_generic/btimer/btimer.c b/bsps/riscv/riscv/btimer/btimer.c
index 4dd3193685..4dd3193685 100644
--- a/bsps/riscv/riscv_generic/btimer/btimer.c
+++ b/bsps/riscv/riscv/btimer/btimer.c
diff --git a/bsps/riscv/riscv_generic/clock/clockdrv.c b/bsps/riscv/riscv/clock/clockdrv.c
index 340e158489..340e158489 100644
--- a/bsps/riscv/riscv_generic/clock/clockdrv.c
+++ b/bsps/riscv/riscv/clock/clockdrv.c
diff --git a/bsps/riscv/riscv_generic/config/rv32i.cfg b/bsps/riscv/riscv/config/rv32i.cfg
index a394590dc2..a394590dc2 100644
--- a/bsps/riscv/riscv_generic/config/rv32i.cfg
+++ b/bsps/riscv/riscv/config/rv32i.cfg
diff --git a/bsps/riscv/riscv_generic/config/rv32iac.cfg b/bsps/riscv/riscv/config/rv32iac.cfg
index 369f2c441d..369f2c441d 100644
--- a/bsps/riscv/riscv_generic/config/rv32iac.cfg
+++ b/bsps/riscv/riscv/config/rv32iac.cfg
diff --git a/bsps/riscv/riscv_generic/config/rv32im.cfg b/bsps/riscv/riscv/config/rv32im.cfg
index 46dfdad09c..46dfdad09c 100644
--- a/bsps/riscv/riscv_generic/config/rv32im.cfg
+++ b/bsps/riscv/riscv/config/rv32im.cfg
diff --git a/bsps/riscv/riscv_generic/config/rv32imac.cfg b/bsps/riscv/riscv/config/rv32imac.cfg
index e19e431b53..e19e431b53 100644
--- a/bsps/riscv/riscv_generic/config/rv32imac.cfg
+++ b/bsps/riscv/riscv/config/rv32imac.cfg
diff --git a/bsps/riscv/riscv_generic/config/rv32imafc.cfg b/bsps/riscv/riscv/config/rv32imafc.cfg
index bd4a0cacbe..bd4a0cacbe 100644
--- a/bsps/riscv/riscv_generic/config/rv32imafc.cfg
+++ b/bsps/riscv/riscv/config/rv32imafc.cfg
diff --git a/bsps/riscv/riscv_generic/config/rv64imac.cfg b/bsps/riscv/riscv/config/rv64imac.cfg
index e5df5995ac..e5df5995ac 100644
--- a/bsps/riscv/riscv_generic/config/rv64imac.cfg
+++ b/bsps/riscv/riscv/config/rv64imac.cfg
diff --git a/bsps/riscv/riscv_generic/config/rv64imafdc.cfg b/bsps/riscv/riscv/config/rv64imafdc.cfg
index 09caf7adbf..09caf7adbf 100644
--- a/bsps/riscv/riscv_generic/config/rv64imafdc.cfg
+++ b/bsps/riscv/riscv/config/rv64imafdc.cfg
diff --git a/bsps/riscv/riscv_generic/console/console-io.c b/bsps/riscv/riscv/console/console-io.c
index a300e11753..a300e11753 100644
--- a/bsps/riscv/riscv_generic/console/console-io.c
+++ b/bsps/riscv/riscv/console/console-io.c
diff --git a/bsps/riscv/riscv/headers.am b/bsps/riscv/riscv/headers.am
new file mode 100644
index 0000000000..ce637f40d1
--- /dev/null
+++ b/bsps/riscv/riscv/headers.am
@@ -0,0 +1,10 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/riscv/riscv/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/riscv/riscv/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/riscv/riscv/include/bsp/irq.h
diff --git a/bsps/riscv/riscv_generic/include/bsp.h b/bsps/riscv/riscv/include/bsp.h
index 79f359ac34..79f359ac34 100644
--- a/bsps/riscv/riscv_generic/include/bsp.h
+++ b/bsps/riscv/riscv/include/bsp.h
diff --git a/bsps/riscv/riscv_generic/include/bsp/irq.h b/bsps/riscv/riscv/include/bsp/irq.h
index d7ee45b378..d7ee45b378 100644
--- a/bsps/riscv/riscv_generic/include/bsp/irq.h
+++ b/bsps/riscv/riscv/include/bsp/irq.h
diff --git a/bsps/riscv/riscv_generic/include/tm27.h b/bsps/riscv/riscv/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/bsps/riscv/riscv_generic/include/tm27.h
+++ b/bsps/riscv/riscv/include/tm27.h
diff --git a/bsps/riscv/riscv_generic/irq/irq.c b/bsps/riscv/riscv/irq/irq.c
index 8090dcea98..8090dcea98 100644
--- a/bsps/riscv/riscv_generic/irq/irq.c
+++ b/bsps/riscv/riscv/irq/irq.c
diff --git a/bsps/riscv/riscv_generic/start/bsp_fatal_halt.c b/bsps/riscv/riscv/start/bsp_fatal_halt.c
index 64c307990b..64c307990b 100644
--- a/bsps/riscv/riscv_generic/start/bsp_fatal_halt.c
+++ b/bsps/riscv/riscv/start/bsp_fatal_halt.c
diff --git a/bsps/riscv/riscv_generic/start/bsp_specs b/bsps/riscv/riscv/start/bsp_specs
index 87638cc027..87638cc027 100644
--- a/bsps/riscv/riscv_generic/start/bsp_specs
+++ b/bsps/riscv/riscv/start/bsp_specs
diff --git a/bsps/riscv/riscv_generic/start/linkcmds b/bsps/riscv/riscv/start/linkcmds
index 7bcf657341..7bcf657341 100644
--- a/bsps/riscv/riscv_generic/start/linkcmds
+++ b/bsps/riscv/riscv/start/linkcmds
diff --git a/bsps/riscv/riscv_generic/start/linkcmds.base b/bsps/riscv/riscv/start/linkcmds.base
index 7d889ab38c..7d889ab38c 100644
--- a/bsps/riscv/riscv_generic/start/linkcmds.base
+++ b/bsps/riscv/riscv/start/linkcmds.base
diff --git a/bsps/riscv/riscv_generic/start/start.S b/bsps/riscv/riscv/start/start.S
index ac5b6a96ef..ac5b6a96ef 100644
--- a/bsps/riscv/riscv_generic/start/start.S
+++ b/bsps/riscv/riscv/start/start.S
diff --git a/bsps/riscv/riscv_generic/headers.am b/bsps/riscv/riscv_generic/headers.am
deleted file mode 100644
index 6993fe8688..0000000000
--- a/bsps/riscv/riscv_generic/headers.am
+++ /dev/null
@@ -1,10 +0,0 @@
-## This file was generated by "./boostrap -H".
-
-include_HEADERS =
-include_HEADERS += ../../../../../../bsps/riscv/riscv_generic/include/bsp.h
-include_HEADERS += include/bspopts.h
-include_HEADERS += ../../../../../../bsps/riscv/riscv_generic/include/tm27.h
-
-include_bspdir = $(includedir)/bsp
-include_bsp_HEADERS =
-include_bsp_HEADERS += ../../../../../../bsps/riscv/riscv_generic/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/riscv/acinclude.m4 b/c/src/lib/libbsp/riscv/acinclude.m4
index 23589932ba..d8b3319b08 100644
--- a/c/src/lib/libbsp/riscv/acinclude.m4
+++ b/c/src/lib/libbsp/riscv/acinclude.m4
@@ -2,8 +2,8 @@
 AC_DEFUN([RTEMS_CHECK_BSPDIR],
 [
   case "$1" in
-  riscv_generic )
-    AC_CONFIG_SUBDIRS([riscv_generic]);;
+  riscv )
+    AC_CONFIG_SUBDIRS([riscv]);;
   *)
     AC_MSG_ERROR([Invalid BSP]);;
   esac
diff --git a/c/src/lib/libbsp/riscv/riscv_generic/Makefile.am b/c/src/lib/libbsp/riscv/riscv/Makefile.am
index 23410e7823..3d819f758b 100644
--- a/c/src/lib/libbsp/riscv/riscv_generic/Makefile.am
+++ b/c/src/lib/libbsp/riscv/riscv/Makefile.am
@@ -8,7 +8,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = ../../../../../../bsps/riscv/riscv_generic/start/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/riscv/riscv/start/bsp_specs
 
 ###############################################################################
 #                  Header                                                     #
@@ -18,7 +18,7 @@ dist_project_lib_DATA = ../../../../../../bsps/riscv/riscv_generic/start/bsp_spe
 #                  Data                                                       #
 ###############################################################################
 
-start.$(OBJEXT): ../../../../../../bsps/riscv/riscv_generic/start/start.S
+start.$(OBJEXT): ../../../../../../bsps/riscv/riscv/start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
@@ -34,7 +34,7 @@ project_lib_LIBRARIES = librtemsbsp.a
 # Startup
 librtemsbsp_a_SOURCES = ../../../../../../bsps/shared/start/bspreset-empty.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspstart-empty.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/riscv/riscv_generic/start/bsp_fatal_halt.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/riscv/riscv/start/bsp_fatal_halt.c
 
 # Shared
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
@@ -43,26 +43,26 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/stackalloc.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
 
 # clock
-librtemsbsp_a_SOURCES +=../../../../../../bsps/riscv/riscv_generic/clock/clockdrv.c
+librtemsbsp_a_SOURCES +=../../../../../../bsps/riscv/riscv/clock/clockdrv.c
 
 # Timer
-librtemsbsp_a_SOURCES += ../../../../../../bsps/riscv/riscv_generic/btimer/btimer.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/riscv/riscv/btimer/btimer.c
 
 # console
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-polled.c
 
 # IRQ
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
-librtemsbsp_a_SOURCES += ../../../../../../bsps/riscv/riscv_generic/irq/irq.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/riscv/riscv/irq/irq.c
 
 # Cache
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c
 
 # debugio
-librtemsbsp_a_SOURCES += ../../../../../../bsps/riscv/riscv_generic/console/console-io.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/riscv/riscv/console/console-io.c
 
 
 include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/irq-sources.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
-include $(srcdir)/../../../../../../bsps/riscv/riscv_generic/headers.am
+include $(srcdir)/../../../../../../bsps/riscv/riscv/headers.am
diff --git a/c/src/lib/libbsp/riscv/riscv_generic/configure.ac b/c/src/lib/libbsp/riscv/riscv/configure.ac
index b6aa54b03c..3226cdc42c 100644
--- a/c/src/lib/libbsp/riscv/riscv_generic/configure.ac
+++ b/c/src/lib/libbsp/riscv/riscv/configure.ac
@@ -2,11 +2,11 @@
 #
 # @file
 #
-# @brief Configure script of LibBSP for riscv_generic BSP.
+# @brief Configure script of LibBSP for riscv BSP.
 #
 
 AC_PREREQ([2.69])
-AC_INIT([rtems-c-src-lib-libbsp-riscv_generic],[_RTEMS_VERSION],[http://www.rtems.org/bugzilla])
+AC_INIT([rtems-c-src-lib-libbsp-riscv],[_RTEMS_VERSION],[http://www.rtems.org/bugzilla])
 RTEMS_TOP(../../../../../..)
 RTEMS_SOURCE_TOP
 RTEMS_BUILD_TOP