bsp/riscv_generic: Rename to "riscv"

Update #3433.

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

bsps/riscv/riscv_generic/headers.am

@@ -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

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

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

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