[rtems commit] bsp/shsim: Move libcpu files to BSP

Sebastian Huber sebh at rtems.org
Fri Dec 8 13:14:03 UTC 2017


Module:    rtems
Branch:    master
Commit:    604f080c2cb526593b9236b5248ca9c2cd92e9b5
Changeset: http://git.rtems.org/rtems/commit/?id=604f080c2cb526593b9236b5248ca9c2cd92e9b5

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Fri Dec  8 13:13:14 2017 +0100

bsp/shsim: Move libcpu files to BSP

Update #3254.

---

 c/src/lib/libbsp/sh/shsim/Makefile.am                             | 6 +++---
 c/src/lib/libbsp/sh/shsim/make/custom/simsh1.cfg                  | 1 -
 c/src/lib/libbsp/sh/shsim/make/custom/simsh2.cfg                  | 1 -
 c/src/lib/libbsp/sh/shsim/make/custom/simsh2e.cfg                 | 1 -
 c/src/lib/libbsp/sh/shsim/make/custom/simsh4.cfg                  | 1 -
 .../{libcpu/sh/shgdb/score => libbsp/sh/shsim/startup}/cpu_asm.c  | 0
 .../{libcpu/sh/shgdb/score => libbsp/sh/shsim/startup}/ispshgdb.c | 0
 c/src/lib/libcpu/sh/Makefile.am                                   | 8 --------
 c/src/lib/libcpu/sh/configure.ac                                  | 1 -
 9 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/c/src/lib/libbsp/sh/shsim/Makefile.am b/c/src/lib/libbsp/sh/shsim/Makefile.am
index 1a3eda3..e49e4f4 100644
--- a/c/src/lib/libbsp/sh/shsim/Makefile.am
+++ b/c/src/lib/libbsp/sh/shsim/Makefile.am
@@ -38,6 +38,8 @@ libbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
 libbsp_a_SOURCES += ../shared/bsphwinit.c
 libbsp_a_SOURCES += startup/sysexit.c
 libbsp_a_SOURCES += ../../shared/bspreset.c
+libbsp_a_SOURCES += startup/cpu_asm.c
+libbsp_a_SOURCES += startup/ispshgdb.c
 
 # clock
 libbsp_a_SOURCES += ../../shared/clock_driver_simidle.c
@@ -51,9 +53,7 @@ libbsp_a_SOURCES += console/console-debugio.c
 # timer
 libbsp_a_SOURCES += ../../shared/timerstub.c
 
-libbsp_a_LIBADD = \
-    ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/score.rel \
-    ../../../libcpu/@RTEMS_CPU@/cache.rel
+libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/cache.rel
 
 include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/sh/shsim/make/custom/simsh1.cfg b/c/src/lib/libbsp/sh/shsim/make/custom/simsh1.cfg
index 84e891a..0f1da68 100644
--- a/c/src/lib/libbsp/sh/shsim/make/custom/simsh1.cfg
+++ b/c/src/lib/libbsp/sh/shsim/make/custom/simsh1.cfg
@@ -6,7 +6,6 @@
 include $(RTEMS_ROOT)/make/custom/default.cfg
 
 RTEMS_CPU=sh
-RTEMS_CPU_MODEL=shgdb
 
 #  This contains the compiler options necessary to select the CPU model
 #  and (hopefully) optimize for it.
diff --git a/c/src/lib/libbsp/sh/shsim/make/custom/simsh2.cfg b/c/src/lib/libbsp/sh/shsim/make/custom/simsh2.cfg
index 8d23897..cde1fb2 100644
--- a/c/src/lib/libbsp/sh/shsim/make/custom/simsh2.cfg
+++ b/c/src/lib/libbsp/sh/shsim/make/custom/simsh2.cfg
@@ -6,7 +6,6 @@
 include $(RTEMS_ROOT)/make/custom/default.cfg
 
 RTEMS_CPU=sh
-RTEMS_CPU_MODEL=shgdb
 
 #  This contains the compiler options necessary to select the CPU model
 #  and (hopefully) optimize for it.
diff --git a/c/src/lib/libbsp/sh/shsim/make/custom/simsh2e.cfg b/c/src/lib/libbsp/sh/shsim/make/custom/simsh2e.cfg
index c47e40f..ce34d26 100644
--- a/c/src/lib/libbsp/sh/shsim/make/custom/simsh2e.cfg
+++ b/c/src/lib/libbsp/sh/shsim/make/custom/simsh2e.cfg
@@ -5,7 +5,6 @@
 include $(RTEMS_ROOT)/make/custom/default.cfg
 
 RTEMS_CPU=sh
-RTEMS_CPU_MODEL=shgdb
 
 #  This contains the compiler options necessary to select the CPU model
 #  and (hopefully) optimize for it.
diff --git a/c/src/lib/libbsp/sh/shsim/make/custom/simsh4.cfg b/c/src/lib/libbsp/sh/shsim/make/custom/simsh4.cfg
index 076ba3d..c23a8b9 100644
--- a/c/src/lib/libbsp/sh/shsim/make/custom/simsh4.cfg
+++ b/c/src/lib/libbsp/sh/shsim/make/custom/simsh4.cfg
@@ -5,7 +5,6 @@
 include $(RTEMS_ROOT)/make/custom/default.cfg
 
 RTEMS_CPU=sh
-RTEMS_CPU_MODEL=shgdb
 
 #  This contains the compiler options necessary to select the CPU model
 #  and (hopefully) optimize for it.
diff --git a/c/src/lib/libcpu/sh/shgdb/score/cpu_asm.c b/c/src/lib/libbsp/sh/shsim/startup/cpu_asm.c
similarity index 100%
rename from c/src/lib/libcpu/sh/shgdb/score/cpu_asm.c
rename to c/src/lib/libbsp/sh/shsim/startup/cpu_asm.c
diff --git a/c/src/lib/libcpu/sh/shgdb/score/ispshgdb.c b/c/src/lib/libbsp/sh/shsim/startup/ispshgdb.c
similarity index 100%
rename from c/src/lib/libcpu/sh/shgdb/score/ispshgdb.c
rename to c/src/lib/libbsp/sh/shsim/startup/ispshgdb.c
diff --git a/c/src/lib/libcpu/sh/Makefile.am b/c/src/lib/libcpu/sh/Makefile.am
index f659bf6..6e15762 100644
--- a/c/src/lib/libcpu/sh/Makefile.am
+++ b/c/src/lib/libcpu/sh/Makefile.am
@@ -129,13 +129,5 @@ sh7750_timer_rel_CPPFLAGS = $(AM_CPPFLAGS)
 sh7750_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 endif
 
-if shgdb
-## sh7045/score
-noinst_PROGRAMS += shgdb/score.rel
-shgdb_score_rel_SOURCES = shgdb/score/cpu_asm.c shgdb/score/ispshgdb.c
-shgdb_score_rel_CPPFLAGS = $(AM_CPPFLAGS)
-shgdb_score_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-endif
-
 include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/sh/configure.ac b/c/src/lib/libcpu/sh/configure.ac
index d410e96..c3172a2 100644
--- a/c/src/lib/libcpu/sh/configure.ac
+++ b/c/src/lib/libcpu/sh/configure.ac
@@ -22,7 +22,6 @@ 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"])
-AM_CONDITIONAL([shgdb],[test x"$RTEMS_CPU_MODEL" = x"shgdb"])
 
 RTEMS_AMPOLISH3
 



More information about the vc mailing list