[rtems commit] bsp/gensh1: Move libcpu files to BSP
Sebastian Huber
sebh at rtems.org
Fri Dec 8 13:14:17 UTC 2017
Module: rtems
Branch: master
Commit: b850e7fb76d224f576de6aff2dfa65d5912e9f3f
Changeset: http://git.rtems.org/rtems/commit/?id=b850e7fb76d224f576de6aff2dfa65d5912e9f3f
Author: Sebastian Huber <sebastian.huber at embedded-brains.de>
Date: Fri Dec 8 13:23:41 2017 +0100
bsp/gensh1: Move libcpu files to BSP
Update #3254.
---
c/src/lib/libbsp/sh/gensh1/Makefile.am | 22 +++++++----
.../sh/sh7032 => libbsp/sh/gensh1}/clock/ckinit.c | 0
.../delay => libbsp/sh/gensh1/clock}/delay.c | 0
.../sh7032/sci => libbsp/sh/gensh1/console}/sci.c | 0
.../sh/gensh1/include/rtems/score}/iosh7032.h | 0
.../sh/gensh1/include/rtems/score}/ispsh7032.h | 0
.../include => libbsp/sh/gensh1/include/sh}/sci.h | 0
.../sh/gensh1/include/sh}/sh7_pfc.h | 0
.../sh/gensh1/include/sh}/sh7_sci.h | 0
c/src/lib/libbsp/sh/gensh1/make/custom/gensh1.cfg | 1 -
c/src/lib/libbsp/sh/gensh1/preinstall.am | 30 +++++++++++++++
.../score => libbsp/sh/gensh1/startup}/cpu_asm.c | 0
.../score => libbsp/sh/gensh1/startup}/ispsh7032.c | 0
.../sh/sh7032 => libbsp/sh/gensh1}/timer/timer.c | 0
c/src/lib/libcpu/sh/Makefile.am | 43 ----------------------
c/src/lib/libcpu/sh/configure.ac | 3 +-
c/src/lib/libcpu/sh/preinstall.am | 31 ----------------
17 files changed, 46 insertions(+), 84 deletions(-)
diff --git a/c/src/lib/libbsp/sh/gensh1/Makefile.am b/c/src/lib/libbsp/sh/gensh1/Makefile.am
index dd80230..61feddc 100644
--- a/c/src/lib/libbsp/sh/gensh1/Makefile.am
+++ b/c/src/lib/libbsp/sh/gensh1/Makefile.am
@@ -2,10 +2,19 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
include $(top_srcdir)/../../../../automake/compile.am
+include_shdir = $(includedir)/sh
+include_rtems_scoredir = $(includedir)/rtems/score
include_bspdir = $(includedir)/bsp
dist_project_lib_DATA = bsp_specs
+include_sh_HEADERS = include/sh/sci.h
+include_sh_HEADERS += include/sh/sh7_pfc.h
+include_sh_HEADERS += include/sh/sh7_sci.h
+
+include_rtems_score_HEADERS = include/rtems/score/ispsh7032.h
+include_rtems_score_HEADERS += include/rtems/score/iosh7032.h
+
include_HEADERS = include/bsp.h
include_HEADERS += include/tm27.h
@@ -38,20 +47,19 @@ libbsp_a_SOURCES += \
../../shared/sbrk.c ../../shared/bootcard.c ../shared/bsphwinit.c \
../../shared/getentropy-cpucounter.c \
../../shared/gnatinstallhandler.c
+libbsp_a_SOURCES += clock/ckinit.c
+libbsp_a_SOURCES += clock/delay.c
+libbsp_a_SOURCES += startup/cpu_asm.c startup/ispsh7032.c
+libbsp_a_SOURCES += timer/timer.c
# scitab
libbsp_a_SOURCES += scitab.c
# console
libbsp_a_SOURCES += ../../sh/shared/console.c
+libbsp_a_SOURCES += console/sci.c
# debugio
libbsp_a_SOURCES += ../../shared/dummy_printk_support.c
-libbsp_a_LIBADD = \
- ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/clock.rel \
- ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/timer.rel \
- ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/sci.rel \
- ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/delay.rel \
- ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/score.rel \
- ../../../libcpu/@RTEMS_CPU@/cache.rel
+libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/cache.rel
EXTRA_DIST = times
diff --git a/c/src/lib/libcpu/sh/sh7032/clock/ckinit.c b/c/src/lib/libbsp/sh/gensh1/clock/ckinit.c
similarity index 100%
rename from c/src/lib/libcpu/sh/sh7032/clock/ckinit.c
rename to c/src/lib/libbsp/sh/gensh1/clock/ckinit.c
diff --git a/c/src/lib/libcpu/sh/sh7032/delay/delay.c b/c/src/lib/libbsp/sh/gensh1/clock/delay.c
similarity index 100%
rename from c/src/lib/libcpu/sh/sh7032/delay/delay.c
rename to c/src/lib/libbsp/sh/gensh1/clock/delay.c
diff --git a/c/src/lib/libcpu/sh/sh7032/sci/sci.c b/c/src/lib/libbsp/sh/gensh1/console/sci.c
similarity index 100%
rename from c/src/lib/libcpu/sh/sh7032/sci/sci.c
rename to c/src/lib/libbsp/sh/gensh1/console/sci.c
diff --git a/c/src/lib/libcpu/sh/sh7032/include/iosh7032.h b/c/src/lib/libbsp/sh/gensh1/include/rtems/score/iosh7032.h
similarity index 100%
rename from c/src/lib/libcpu/sh/sh7032/include/iosh7032.h
rename to c/src/lib/libbsp/sh/gensh1/include/rtems/score/iosh7032.h
diff --git a/c/src/lib/libcpu/sh/sh7032/include/ispsh7032.h b/c/src/lib/libbsp/sh/gensh1/include/rtems/score/ispsh7032.h
similarity index 100%
rename from c/src/lib/libcpu/sh/sh7032/include/ispsh7032.h
rename to c/src/lib/libbsp/sh/gensh1/include/rtems/score/ispsh7032.h
diff --git a/c/src/lib/libcpu/sh/sh7032/include/sci.h b/c/src/lib/libbsp/sh/gensh1/include/sh/sci.h
similarity index 100%
rename from c/src/lib/libcpu/sh/sh7032/include/sci.h
rename to c/src/lib/libbsp/sh/gensh1/include/sh/sci.h
diff --git a/c/src/lib/libcpu/sh/sh7032/include/sh7_pfc.h b/c/src/lib/libbsp/sh/gensh1/include/sh/sh7_pfc.h
similarity index 100%
rename from c/src/lib/libcpu/sh/sh7032/include/sh7_pfc.h
rename to c/src/lib/libbsp/sh/gensh1/include/sh/sh7_pfc.h
diff --git a/c/src/lib/libcpu/sh/sh7032/include/sh7_sci.h b/c/src/lib/libbsp/sh/gensh1/include/sh/sh7_sci.h
similarity index 100%
rename from c/src/lib/libcpu/sh/sh7032/include/sh7_sci.h
rename to c/src/lib/libbsp/sh/gensh1/include/sh/sh7_sci.h
diff --git a/c/src/lib/libbsp/sh/gensh1/make/custom/gensh1.cfg b/c/src/lib/libbsp/sh/gensh1/make/custom/gensh1.cfg
index fb066ed..16b61d2 100644
--- a/c/src/lib/libbsp/sh/gensh1/make/custom/gensh1.cfg
+++ b/c/src/lib/libbsp/sh/gensh1/make/custom/gensh1.cfg
@@ -9,7 +9,6 @@
include $(RTEMS_ROOT)/make/custom/default.cfg
RTEMS_CPU=sh
-RTEMS_CPU_MODEL=sh7032
# This contains the compiler options necessary to select the CPU model
# and (hopefully) optimize for it.
diff --git a/c/src/lib/libbsp/sh/gensh1/preinstall.am b/c/src/lib/libbsp/sh/gensh1/preinstall.am
index 5bc0ed6..8132cc2 100644
--- a/c/src/lib/libbsp/sh/gensh1/preinstall.am
+++ b/c/src/lib/libbsp/sh/gensh1/preinstall.am
@@ -28,6 +28,16 @@ $(PROJECT_INCLUDE)/$(dirstamp):
@: > $(PROJECT_INCLUDE)/$(dirstamp)
PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
+$(PROJECT_INCLUDE)/sh/$(dirstamp):
+ @$(MKDIR_P) $(PROJECT_INCLUDE)/sh
+ @: > $(PROJECT_INCLUDE)/sh/$(dirstamp)
+PREINSTALL_DIRS += $(PROJECT_INCLUDE)/sh/$(dirstamp)
+
+$(PROJECT_INCLUDE)/rtems/score/$(dirstamp):
+ @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/score
+ @: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
+PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
+
$(PROJECT_INCLUDE)/bsp/$(dirstamp):
@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
@@ -37,6 +47,26 @@ $(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
+$(PROJECT_INCLUDE)/sh/sci.h: include/sh/sci.h $(PROJECT_INCLUDE)/sh/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sci.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sci.h
+
+$(PROJECT_INCLUDE)/sh/sh7_pfc.h: include/sh/sh7_pfc.h $(PROJECT_INCLUDE)/sh/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sh7_pfc.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sh7_pfc.h
+
+$(PROJECT_INCLUDE)/sh/sh7_sci.h: include/sh/sh7_sci.h $(PROJECT_INCLUDE)/sh/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sh7_sci.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sh7_sci.h
+
+$(PROJECT_INCLUDE)/rtems/score/ispsh7032.h: include/rtems/score/ispsh7032.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/ispsh7032.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/ispsh7032.h
+
+$(PROJECT_INCLUDE)/rtems/score/iosh7032.h: include/rtems/score/iosh7032.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/iosh7032.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/iosh7032.h
+
$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
diff --git a/c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c b/c/src/lib/libbsp/sh/gensh1/startup/cpu_asm.c
similarity index 100%
rename from c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c
rename to c/src/lib/libbsp/sh/gensh1/startup/cpu_asm.c
diff --git a/c/src/lib/libcpu/sh/sh7032/score/ispsh7032.c b/c/src/lib/libbsp/sh/gensh1/startup/ispsh7032.c
similarity index 100%
rename from c/src/lib/libcpu/sh/sh7032/score/ispsh7032.c
rename to c/src/lib/libbsp/sh/gensh1/startup/ispsh7032.c
diff --git a/c/src/lib/libcpu/sh/sh7032/timer/timer.c b/c/src/lib/libbsp/sh/gensh1/timer/timer.c
similarity index 100%
rename from c/src/lib/libcpu/sh/sh7032/timer/timer.c
rename to c/src/lib/libbsp/sh/gensh1/timer/timer.c
diff --git a/c/src/lib/libcpu/sh/Makefile.am b/c/src/lib/libcpu/sh/Makefile.am
index 6e15762..3422fd7 100644
--- a/c/src/lib/libcpu/sh/Makefile.am
+++ b/c/src/lib/libcpu/sh/Makefile.am
@@ -9,49 +9,6 @@ cache_rel_SOURCES = ../shared/src/cache_manager.c
cache_rel_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/cache
cache_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-if sh7032
-# NOTE: Unlike other CPUS, we install into a subdirectory to avoid
-# file name conflicts
-include_shdir = $(includedir)/sh
-include_rtems_scoredir = $(includedir)/rtems/score
-
-include_sh_HEADERS = sh7032/include/sci.h
-include_sh_HEADERS += sh7032/include/sh7_pfc.h
-include_sh_HEADERS += sh7032/include/sh7_sci.h
-include_rtems_score_HEADERS = sh7032/include/ispsh7032.h
-include_rtems_score_HEADERS += sh7032/include/iosh7032.h
-
-## sh7032/clock
-noinst_PROGRAMS += sh7032/clock.rel
-sh7032_clock_rel_SOURCES = sh7032/clock/ckinit.c
-sh7032_clock_rel_CPPFLAGS = $(AM_CPPFLAGS)
-sh7032_clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-## sh7032/delay
-noinst_PROGRAMS += sh7032/delay.rel
-sh7032_delay_rel_SOURCES = sh7032/delay/delay.c
-sh7032_delay_rel_CPPFLAGS = $(AM_CPPFLAGS)
-sh7032_delay_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-## sh7032/sci
-noinst_PROGRAMS += sh7032/sci.rel
-sh7032_sci_rel_SOURCES = sh7032/sci/sci.c
-sh7032_sci_rel_CPPFLAGS = $(AM_CPPFLAGS)
-sh7032_sci_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-## sh7032/score
-noinst_PROGRAMS += sh7032/score.rel
-sh7032_score_rel_SOURCES = sh7032/score/cpu_asm.c sh7032/score/ispsh7032.c
-sh7032_score_rel_CPPFLAGS = $(AM_CPPFLAGS)
-sh7032_score_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-### sh7032/timer
-noinst_PROGRAMS += sh7032/timer.rel
-sh7032_timer_rel_SOURCES = sh7032/timer/timer.c
-sh7032_timer_rel_CPPFLAGS = $(AM_CPPFLAGS)
-sh7032_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-endif
-
if sh7045
# NOTE: Unlike other CPUS, we install into a subdirectory to avoid
# file name conflicts
diff --git a/c/src/lib/libcpu/sh/configure.ac b/c/src/lib/libcpu/sh/configure.ac
index c3172a2..105f695 100644
--- a/c/src/lib/libcpu/sh/configure.ac
+++ b/c/src/lib/libcpu/sh/configure.ac
@@ -2,7 +2,7 @@
AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libcpu-sh],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
-AC_CONFIG_SRCDIR([sh7032])
+AC_CONFIG_SRCDIR([cache])
RTEMS_TOP([../../../../..],[../../..])
RTEMS_CANONICAL_TARGET_CPU
@@ -19,7 +19,6 @@ AM_PROG_CC_C_O
RTEMS_CANONICALIZE_TOOLS
RTEMS_PROG_CCAS
-AM_CONDITIONAL([sh7032],[test x"$RTEMS_CPU_MODEL" = x"sh7032"])
AM_CONDITIONAL([sh7045],[test x"$RTEMS_CPU_MODEL" = x"sh7045"])
AM_CONDITIONAL([sh7750],[test x"$RTEMS_CPU_MODEL" = x"sh7750"])
diff --git a/c/src/lib/libcpu/sh/preinstall.am b/c/src/lib/libcpu/sh/preinstall.am
index 9b12347..163813a 100644
--- a/c/src/lib/libcpu/sh/preinstall.am
+++ b/c/src/lib/libcpu/sh/preinstall.am
@@ -13,37 +13,6 @@ all-am: $(PREINSTALL_FILES)
PREINSTALL_FILES =
CLEANFILES = $(PREINSTALL_FILES)
-if sh7032
-$(PROJECT_INCLUDE)/sh/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/sh
- @: > $(PROJECT_INCLUDE)/sh/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/sh/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/score/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/score
- @: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-
-$(PROJECT_INCLUDE)/sh/sci.h: sh7032/include/sci.h $(PROJECT_INCLUDE)/sh/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sci.h
-
-$(PROJECT_INCLUDE)/sh/sh7_pfc.h: sh7032/include/sh7_pfc.h $(PROJECT_INCLUDE)/sh/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sh7_pfc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sh7_pfc.h
-
-$(PROJECT_INCLUDE)/sh/sh7_sci.h: sh7032/include/sh7_sci.h $(PROJECT_INCLUDE)/sh/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sh7_sci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sh7_sci.h
-
-$(PROJECT_INCLUDE)/rtems/score/ispsh7032.h: sh7032/include/ispsh7032.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/ispsh7032.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/ispsh7032.h
-
-$(PROJECT_INCLUDE)/rtems/score/iosh7032.h: sh7032/include/iosh7032.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/iosh7032.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/iosh7032.h
-endif
if sh7045
$(PROJECT_INCLUDE)/sh/$(dirstamp):
@$(MKDIR_P) $(PROJECT_INCLUDE)/sh
More information about the vc
mailing list