From 4f0dca3ad265e1871f9558497647a522548f62d5 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Tue, 3 Apr 2018 07:09:11 +0200 Subject: bsps: Move version.c and use bspopts.h This patch is a part of the BSP source reorganization. Update #3285. Update #3375. --- c/src/configure.ac | 2 -- c/src/support/Makefile.am | 10 ---------- c/src/support/version.c | 26 -------------------------- c/src/wrapup/Makefile.am | 2 -- 4 files changed, 40 deletions(-) delete mode 100644 c/src/support/Makefile.am delete mode 100644 c/src/support/version.c (limited to 'c') diff --git a/c/src/configure.ac b/c/src/configure.ac index ff7c7752ed..508f20f18e 100644 --- a/c/src/configure.ac +++ b/c/src/configure.ac @@ -134,7 +134,6 @@ AC_SUBST(libbsp_cpu_subdir,$RTEMS_CPU) BSP_SUBDIRS="$BSP_SUBDIRS lib/libbsp" BSP_SUBDIRS="$BSP_SUBDIRS libchip" -BSP_SUBDIRS="$BSP_SUBDIRS support" BSP_SUBDIRS="$BSP_SUBDIRS wrapup" # Build testsuites @@ -168,7 +167,6 @@ AC_CONFIG_FILES([Makefile], MAKE=${MAKE}]) AC_CONFIG_FILES([ -support/Makefile libchip/Makefile lib/libbsp/Makefile wrapup/Makefile diff --git a/c/src/support/Makefile.am b/c/src/support/Makefile.am deleted file mode 100644 index 66c81546c2..0000000000 --- a/c/src/support/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -include $(top_srcdir)/automake/compile.am - -AM_CPPFLAGS += -DRTEMS_BSP=\"@RTEMS_BSP@\" - -noinst_LIBRARIES = libsupport.a - -libsupport_a_SOURCES = version.c -libsupport_a_CPPFLAGS = $(AM_CPPFLAGS) - -include $(top_srcdir)/automake/local.am diff --git a/c/src/support/version.c b/c/src/support/version.c deleted file mode 100644 index 4caf0bd3f7..0000000000 --- a/c/src/support/version.c +++ /dev/null @@ -1,26 +0,0 @@ -/* - * COPYRIGHT (c) 2003, Ralf Corsepius, Ulm, Germany. - * COPYRIGHT (c) 2003, On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.org/license/LICENSE. - */ - -#include - -#ifndef RTEMS_VERSION -#error "Missing RTEMS_VERSION" -#endif -#ifndef CPU_NAME -#error "Missing CPU_NAME" -#endif -#ifndef CPU_MODEL_NAME -#error "Missing CPU_MODEL_NAME" -#endif -#ifndef RTEMS_BSP -#error "Missing RTEMS_BSP" -#endif - -const char _RTEMS_version[] = - "rtems-" RTEMS_VERSION " (" CPU_NAME "/" CPU_MODEL_NAME "/" RTEMS_BSP ")"; diff --git a/c/src/wrapup/Makefile.am b/c/src/wrapup/Makefile.am index a52b90df6f..42d283ab6a 100644 --- a/c/src/wrapup/Makefile.am +++ b/c/src/wrapup/Makefile.am @@ -13,8 +13,6 @@ TMPINSTALL_FILES = $(PROJECT_LIB)/librtemsbsp.a CLEANFILES = o-optimize/librtemsbsp.a -SRCS = ../support/libsupport.a - SRCS += ../lib/libbsp/@RTEMS_CPU@/@RTEMS_BSP_FAMILY@/libbsp.a SRCS += ../libchip/libflash.a -- cgit v1.2.3