From 6f5d88a4695d2f0886fe03e28001926d775938c7 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Fri, 22 Jun 2018 07:06:57 +0200 Subject: bsp/riscv_generic: Rename to "riscv" Update #3433. --- c/src/lib/libbsp/riscv/acinclude.m4 | 4 +- c/src/lib/libbsp/riscv/riscv/Makefile.am | 68 +++++++++++++++++++++++ c/src/lib/libbsp/riscv/riscv/configure.ac | 32 +++++++++++ c/src/lib/libbsp/riscv/riscv_generic/Makefile.am | 68 ----------------------- c/src/lib/libbsp/riscv/riscv_generic/configure.ac | 32 ----------- 5 files changed, 102 insertions(+), 102 deletions(-) create mode 100644 c/src/lib/libbsp/riscv/riscv/Makefile.am create mode 100644 c/src/lib/libbsp/riscv/riscv/configure.ac delete mode 100644 c/src/lib/libbsp/riscv/riscv_generic/Makefile.am delete mode 100644 c/src/lib/libbsp/riscv/riscv_generic/configure.ac (limited to 'c') 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/Makefile.am b/c/src/lib/libbsp/riscv/riscv/Makefile.am new file mode 100644 index 0000000000..3d819f758b --- /dev/null +++ b/c/src/lib/libbsp/riscv/riscv/Makefile.am @@ -0,0 +1,68 @@ +## +# +# @brief Makefile of LibBSP for the RISCV/Spike simulator. +# +# +ACLOCAL_AMFLAGS = -I ../../../../aclocal + +include $(top_srcdir)/../../../../automake/compile.am +include $(top_srcdir)/../../bsp.am + +dist_project_lib_DATA = ../../../../../../bsps/riscv/riscv/start/bsp_specs + +############################################################################### +# Header # +############################################################################### + +############################################################################### +# Data # +############################################################################### + +start.$(OBJEXT): ../../../../../../bsps/riscv/riscv/start/start.S + $(CPPASCOMPILE) -o $@ -c $< +project_lib_DATA = start.$(OBJEXT) + +project_lib_DATA += linkcmds +project_lib_DATA += ../../../../../../bsps/riscv/riscv/start/linkcmds.base + +############################################################################### +# LibBSP # +############################################################################### + +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/start/bsp_fatal_halt.c + +# Shared +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/stackalloc.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c + +# clock +librtemsbsp_a_SOURCES +=../../../../../../bsps/riscv/riscv/clock/clockdrv.c + +# Timer +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/irq/irq.c + +# Cache +librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c + +# debugio +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/headers.am diff --git a/c/src/lib/libbsp/riscv/riscv/configure.ac b/c/src/lib/libbsp/riscv/riscv/configure.ac new file mode 100644 index 0000000000..3226cdc42c --- /dev/null +++ b/c/src/lib/libbsp/riscv/riscv/configure.ac @@ -0,0 +1,32 @@ +## +# +# @file +# +# @brief Configure script of LibBSP for riscv BSP. +# + +AC_PREREQ([2.69]) +AC_INIT([rtems-c-src-lib-libbsp-riscv],[_RTEMS_VERSION],[http://www.rtems.org/bugzilla]) +RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP +RTEMS_BSP_LINKCMDS + +RTEMS_CANONICAL_TARGET_CPU +AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) +RTEMS_BSP_CONFIGURE + +RTEMS_BSPOPTS_SET([BSP_START_RESET_VECTOR],[*],[]) +RTEMS_BSPOPTS_HELP([BSP_START_RESET_VECTOR],[reset vector address for BSP +start]) + +RTEMS_BSPOPTS_SET([BSP_RISCV32_PERIPHCLK],[*],[100000000U]) +RTEMS_BSPOPTS_HELP([BSP_RISCV32_PERIPHCLK],[riscv PERIPHCLK clock +frequency in Hz]) + + + +RTEMS_BSP_CLEANUP_OPTIONS + +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT diff --git a/c/src/lib/libbsp/riscv/riscv_generic/Makefile.am b/c/src/lib/libbsp/riscv/riscv_generic/Makefile.am deleted file mode 100644 index 23410e7823..0000000000 --- a/c/src/lib/libbsp/riscv/riscv_generic/Makefile.am +++ /dev/null @@ -1,68 +0,0 @@ -## -# -# @brief Makefile of LibBSP for the RISCV/Spike simulator. -# -# -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 - -############################################################################### -# Header # -############################################################################### - -############################################################################### -# Data # -############################################################################### - -start.$(OBJEXT): ../../../../../../bsps/riscv/riscv_generic/start/start.S - $(CPPASCOMPILE) -o $@ -c $< -project_lib_DATA = start.$(OBJEXT) - -project_lib_DATA += linkcmds -project_lib_DATA += ../../../../../../bsps/riscv/riscv/start/linkcmds.base - -############################################################################### -# LibBSP # -############################################################################### - -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 - -# Shared -librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c -librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c -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 - -# Timer -librtemsbsp_a_SOURCES += ../../../../../../bsps/riscv/riscv_generic/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 - -# Cache -librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c - -# debugio -librtemsbsp_a_SOURCES += ../../../../../../bsps/riscv/riscv_generic/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 diff --git a/c/src/lib/libbsp/riscv/riscv_generic/configure.ac b/c/src/lib/libbsp/riscv/riscv_generic/configure.ac deleted file mode 100644 index b6aa54b03c..0000000000 --- a/c/src/lib/libbsp/riscv/riscv_generic/configure.ac +++ /dev/null @@ -1,32 +0,0 @@ -## -# -# @file -# -# @brief Configure script of LibBSP for riscv_generic BSP. -# - -AC_PREREQ([2.69]) -AC_INIT([rtems-c-src-lib-libbsp-riscv_generic],[_RTEMS_VERSION],[http://www.rtems.org/bugzilla]) -RTEMS_TOP(../../../../../..) -RTEMS_SOURCE_TOP -RTEMS_BUILD_TOP -RTEMS_BSP_LINKCMDS - -RTEMS_CANONICAL_TARGET_CPU -AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2]) -RTEMS_BSP_CONFIGURE - -RTEMS_BSPOPTS_SET([BSP_START_RESET_VECTOR],[*],[]) -RTEMS_BSPOPTS_HELP([BSP_START_RESET_VECTOR],[reset vector address for BSP -start]) - -RTEMS_BSPOPTS_SET([BSP_RISCV32_PERIPHCLK],[*],[100000000U]) -RTEMS_BSPOPTS_HELP([BSP_RISCV32_PERIPHCLK],[riscv PERIPHCLK clock -frequency in Hz]) - - - -RTEMS_BSP_CLEANUP_OPTIONS - -AC_CONFIG_FILES([Makefile]) -AC_OUTPUT -- cgit v1.2.3