diff options
Diffstat (limited to '')
12 files changed, 9 insertions, 248 deletions
diff --git a/c/src/lib/libbsp/epiphany/epiphany_sim/include/bsp.h b/bsps/epiphany/epiphany_sim/include/bsp.h index 46d495a8c5..46d495a8c5 100644 --- a/c/src/lib/libbsp/epiphany/epiphany_sim/include/bsp.h +++ b/bsps/epiphany/epiphany_sim/include/bsp.h diff --git a/c/src/lib/libbsp/epiphany/epiphany_sim/include/irq.h b/bsps/epiphany/epiphany_sim/include/bsp/irq.h index 2b15a4536c..2b15a4536c 100644 --- a/c/src/lib/libbsp/epiphany/epiphany_sim/include/irq.h +++ b/bsps/epiphany/epiphany_sim/include/bsp/irq.h diff --git a/c/src/lib/libbsp/epiphany/epiphany_sim/include/tm27.h b/bsps/epiphany/epiphany_sim/include/tm27.h index 0dfa7bf628..0dfa7bf628 100644 --- a/c/src/lib/libbsp/epiphany/epiphany_sim/include/tm27.h +++ b/bsps/epiphany/epiphany_sim/include/tm27.h diff --git a/c/src/lib/libbsp/epiphany/shared/include/linker-symbols.h b/bsps/epiphany/include/bsp/linker-symbols.h index c218b7ff99..c218b7ff99 100644 --- a/c/src/lib/libbsp/epiphany/shared/include/linker-symbols.h +++ b/bsps/epiphany/include/bsp/linker-symbols.h diff --git a/c/src/lib/libbsp/epiphany/Makefile.am b/c/src/lib/libbsp/epiphany/Makefile.am index 86705a772c..f0db9ba0b8 100644 --- a/c/src/lib/libbsp/epiphany/Makefile.am +++ b/c/src/lib/libbsp/epiphany/Makefile.am @@ -3,6 +3,6 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal ## Currently, the shared directory is not explicitly ## added but it is present in the source tree. _SUBDIRS = @RTEMS_BSP_FAMILY@ -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../automake/subdirs.am include $(top_srcdir)/../../../automake/local.am +include $(srcdir)/../../../../../bsps/epiphany/headers.am diff --git a/c/src/lib/libbsp/epiphany/configure.ac b/c/src/lib/libbsp/epiphany/configure.ac index bba5440ca9..f351e1820f 100644 --- a/c/src/lib/libbsp/epiphany/configure.ac +++ b/c/src/lib/libbsp/epiphany/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-epiphany],[_RTEMS_VERSION],[http://www.rtems.org/bugzilla]) AC_CONFIG_SRCDIR([epiphany_sim]) RTEMS_TOP(../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define foreign subdir-objects 1.12.2]) diff --git a/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am b/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am index 3645c024dc..3401b9a4d6 100644 --- a/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am +++ b/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am @@ -9,31 +9,12 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp -include_libcpudir = $(includedir)/libcpu - -dist_project_lib_DATA = bsp_specs +dist_project_lib_DATA = startup/bsp_specs ############################################################################### # Header # ############################################################################### -include_HEADERS = include/bsp.h -include_HEADERS += include/tm27.h - -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h -include_bsp_HEADERS = ../shared/include/linker-symbols.h - -include_bsp_HEADERS += ../../../libbsp/shared/include/mm.h -include_bsp_HEADERS += ../../shared/include/utility.h -include_bsp_HEADERS += ../../shared/include/irq-generic.h -include_bsp_HEADERS += ../../shared/include/irq-info.h -include_bsp_HEADERS += ../../shared/include/stackalloc.h -include_bsp_HEADERS += ../../shared/include/console-polled.h -include_bsp_HEADERS += include/irq.h - -nodist_include_HEADERS = include/bspopts.h - ############################################################################### # Data # ############################################################################### @@ -43,7 +24,7 @@ start.$(OBJEXT): start/start.S $(CPPASCOMPILE) -o $@ -c $< project_lib_DATA = start.$(OBJEXT) -project_lib_DATA += startup/linkcmds +project_lib_DATA += linkcmds ############################################################################### # LibBSP # @@ -90,5 +71,5 @@ libbsp_a_SOURCES += console/console-io.c DISTCLEANFILES = include/bspopts.h -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/epiphany/epiphany_sim/headers.am diff --git a/c/src/lib/libbsp/epiphany/epiphany_sim/configure.ac b/c/src/lib/libbsp/epiphany/epiphany_sim/configure.ac index 05d29d7471..b5448a7ae3 100644 --- a/c/src/lib/libbsp/epiphany/epiphany_sim/configure.ac +++ b/c/src/lib/libbsp/epiphany/epiphany_sim/configure.ac @@ -9,6 +9,9 @@ AC_PREREQ(2.69) AC_INIT([rtems-c-src-lib-libbsp-epiphany-sim],[_RTEMS_VERSION],[http://www.rtems.org/bugzilla]) AC_CONFIG_SRCDIR([make/custom/epiphany_sim.cfg]) RTEMS_TOP(../../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP +RTEMS_BSP_LINKCMDS RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define nostdinc foreign subdir-objects 1.12.2]) @@ -30,7 +33,6 @@ RTEMS_CHECK_SMP AM_CONDITIONAL(HAS_SMP,[test "$rtems_cv_HAS_SMP" = "yes"]) RTEMS_BSP_CLEANUP_OPTIONS -RTEMS_BSP_LINKCMDS AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/c/src/lib/libbsp/epiphany/epiphany_sim/include/bspopts.h b/c/src/lib/libbsp/epiphany/epiphany_sim/include/bspopts.h deleted file mode 100644 index c5d9a60f92..0000000000 --- a/c/src/lib/libbsp/epiphany/epiphany_sim/include/bspopts.h +++ /dev/null @@ -1,117 +0,0 @@ -/** - * @ingroup bsp_epiphany - * - * @brief Epiphany BSP Options - */ - -/* - * - * Copyright (c) 2015 University of York. - * Hesham ALMatary <hmka501@york.ac.uk> - * - * COPYRIGHT (c) 1989-1999. - * On-Line Applications Research Corporation (OAR). - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -/* include/bspopts.h.in. Generated from configure.ac by autoheader. */ - -#ifndef LIBBSP_EPIPHANY_EPIPHANY_SIM_OPTS_H -#define LIBBSP_EPIPHANY_EPIPHANY_SIM_OPTS_H - -/** - * @name Options - * - * @{ - */ - -/** - * @brief Dirties memory to test for programs that assume zeroed memory. - * - * If defined, then the BSP Framework will put a non-zero pattern into the - * RTEMS Workspace and C program heap. This should assist in finding code that - * assumes memory starts set to zero. - */ -#undef BSP_DIRTY_MEMORY - -/** - * @brief Print and wait for key press for reset. - * - * If defined, print a message and wait until pressed before resetting board - * when application exits. - */ -#undef BSP_PRESS_KEY_FOR_RESET - -/** - * @brief Prints exception context upon unexpected exceptions - * - * If defined, prints the exception context when an unexpected exception occurs. - */ -#undef BSP_PRINT_EXCEPTION_CONTEXT - -/** - * @brief Resets on application exit. - * - * If defined, reset the board when the application exits. - */ -#undef BSP_RESET_BOARD_AT_EXIT - -/** - * @brief Reset vector address for BSP start - */ -#undef BSP_START_RESET_VECTOR - -/** - * @brief Define to the address where bug reports for this package should be - * sent. - */ -#undef PACKAGE_BUGREPORT - -/** - * @brief Define to the full name of this package. - */ -#undef PACKAGE_NAME - -/** - * @brief Define to the full name and version of this package. - */ -#undef PACKAGE_STRING - -/** - * @brief Define to the one symbol short name of this package. - */ -#undef PACKAGE_TARNAME - -/** - * @brief Define to the home page for this package. - */ -#undef PACKAGE_URL - -/** - * @brief Define to the version of this package. - */ -#undef PACKAGE_VERSION - -/** @} */ - -#endif /* LIBBSP_EPIPHANY_EPIPHANY_SIM_OPTS_H */ diff --git a/c/src/lib/libbsp/epiphany/epiphany_sim/preinstall.am b/c/src/lib/libbsp/epiphany/epiphany_sim/preinstall.am deleted file mode 100644 index e35a2e7a5f..0000000000 --- a/c/src/lib/libbsp/epiphany/epiphany_sim/preinstall.am +++ /dev/null @@ -1,100 +0,0 @@ -## Automatically generated by ampolish3 - Do not edit - -if AMPOLISH3 -$(srcdir)/preinstall.am: Makefile.am - $(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am -endif - -PREINSTALL_DIRS = -DISTCLEANFILES += $(PREINSTALL_DIRS) - -all-am: $(PREINSTALL_FILES) - -PREINSTALL_FILES = -CLEANFILES = $(PREINSTALL_FILES) - -all-local: $(TMPINSTALL_FILES) - -TMPINSTALL_FILES = -CLEANFILES += $(TMPINSTALL_FILES) - -$(PROJECT_LIB)/$(dirstamp): - @$(MKDIR_P) $(PROJECT_LIB) - @: > $(PROJECT_LIB)/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp) - -$(PROJECT_INCLUDE)/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE) - @: > $(PROJECT_INCLUDE)/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp) - -$(PROJECT_INCLUDE)/bsp/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/bsp - @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp) - -$(PROJECT_INCLUDE)/libcpu/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/libcpu - @: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - -$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs -PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs - -$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h - -$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h - -$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h - -$(PROJECT_INCLUDE)/bsp/linker-symbols.h: ../shared/include/linker-symbols.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/linker-symbols.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/linker-symbols.h - -$(PROJECT_INCLUDE)/bsp/mm.h: ../../../libbsp/shared/include/mm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/mm.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mm.h - -$(PROJECT_INCLUDE)/bsp/utility.h: ../../shared/include/utility.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/utility.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/utility.h - -$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h - -$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h - -$(PROJECT_INCLUDE)/bsp/stackalloc.h: ../../shared/include/stackalloc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stackalloc.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stackalloc.h - -$(PROJECT_INCLUDE)/bsp/console-polled.h: ../../shared/include/console-polled.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/console-polled.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/console-polled.h - -$(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h - -$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h - -$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT) -TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT) - -$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds -TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds - diff --git a/c/src/lib/libbsp/epiphany/epiphany_sim/bsp_specs b/c/src/lib/libbsp/epiphany/epiphany_sim/startup/bsp_specs index 87638cc027..87638cc027 100644 --- a/c/src/lib/libbsp/epiphany/epiphany_sim/bsp_specs +++ b/c/src/lib/libbsp/epiphany/epiphany_sim/startup/bsp_specs diff --git a/c/src/lib/libbsp/epiphany/preinstall.am b/c/src/lib/libbsp/epiphany/preinstall.am deleted file mode 100644 index dba6cc4d81..0000000000 --- a/c/src/lib/libbsp/epiphany/preinstall.am +++ /dev/null @@ -1,7 +0,0 @@ -## Automatically generated by ampolish3 - Do not edit - -if AMPOLISH3 -$(srcdir)/preinstall.am: Makefile.am - $(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am -endif - |