bsp/gensh2: Move libcpu files to BSP

Update #3254.

16 files changed, 0 insertions, 79 deletions

diff --git a/c/src/lib/libcpu/sh/sh7045/clock/ckinit.c b/c/src/lib/libbsp/sh/gensh2/clock/ckinit.c
index 5120b594eb..5120b594eb 100644
--- a/c/src/lib/libcpu/sh/sh7045/clock/ckinit.c
+++ b/c/src/lib/libbsp/sh/gensh2/clock/ckinit.c
diff --git a/c/src/lib/libcpu/sh/sh7045/sci/sci.c b/c/src/lib/libbsp/sh/gensh2/console/sci.c
index 143fc1bb94..143fc1bb94 100644
--- a/c/src/lib/libcpu/sh/sh7045/sci/sci.c
+++ b/c/src/lib/libbsp/sh/gensh2/console/sci.c
diff --git a/c/src/lib/libcpu/sh/sh7045/sci/sci_termios.c b/c/src/lib/libbsp/sh/gensh2/console/sci_termios.c
index 5d588065af..5d588065af 100644
--- a/c/src/lib/libcpu/sh/sh7045/sci/sci_termios.c
+++ b/c/src/lib/libbsp/sh/gensh2/console/sci_termios.c
diff --git a/c/src/lib/libcpu/sh/sh7045/include/iosh7045.h b/c/src/lib/libbsp/sh/gensh2/include/rtems/score/iosh7045.h
index db3252b72d..db3252b72d 100644
--- a/c/src/lib/libcpu/sh/sh7045/include/iosh7045.h
+++ b/c/src/lib/libbsp/sh/gensh2/include/rtems/score/iosh7045.h
diff --git a/c/src/lib/libcpu/sh/sh7045/include/ispsh7045.h b/c/src/lib/libbsp/sh/gensh2/include/rtems/score/ispsh7045.h
index fb9f5297ae..fb9f5297ae 100644
--- a/c/src/lib/libcpu/sh/sh7045/include/ispsh7045.h
+++ b/c/src/lib/libbsp/sh/gensh2/include/rtems/score/ispsh7045.h
diff --git a/c/src/lib/libcpu/sh/sh7045/include/io_types.h b/c/src/lib/libbsp/sh/gensh2/include/sh/io_types.h
index 1dab885672..1dab885672 100644
--- a/c/src/lib/libcpu/sh/sh7045/include/io_types.h
+++ b/c/src/lib/libbsp/sh/gensh2/include/sh/io_types.h
diff --git a/c/src/lib/libcpu/sh/sh7045/include/sci.h b/c/src/lib/libbsp/sh/gensh2/include/sh/sci.h
index dc34371d48..dc34371d48 100644
--- a/c/src/lib/libcpu/sh/sh7045/include/sci.h
+++ b/c/src/lib/libbsp/sh/gensh2/include/sh/sci.h
diff --git a/c/src/lib/libcpu/sh/sh7045/include/sci_termios.h b/c/src/lib/libbsp/sh/gensh2/include/sh/sci_termios.h
index 63750c9461..63750c9461 100644
--- a/c/src/lib/libcpu/sh/sh7045/include/sci_termios.h
+++ b/c/src/lib/libbsp/sh/gensh2/include/sh/sci_termios.h
diff --git a/c/src/lib/libcpu/sh/sh7045/include/sh7_pfc.h b/c/src/lib/libbsp/sh/gensh2/include/sh/sh7_pfc.h
index b56433a9e2..b56433a9e2 100644
--- a/c/src/lib/libcpu/sh/sh7045/include/sh7_pfc.h
+++ b/c/src/lib/libbsp/sh/gensh2/include/sh/sh7_pfc.h
diff --git a/c/src/lib/libcpu/sh/sh7045/include/sh7_sci.h b/c/src/lib/libbsp/sh/gensh2/include/sh/sh7_sci.h
index 7218313704..7218313704 100644
--- a/c/src/lib/libcpu/sh/sh7045/include/sh7_sci.h
+++ b/c/src/lib/libbsp/sh/gensh2/include/sh/sh7_sci.h
diff --git a/c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c b/c/src/lib/libbsp/sh/gensh2/startup/cpu_asm.c
index 47bc859dbd..47bc859dbd 100644
--- a/c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c
+++ b/c/src/lib/libbsp/sh/gensh2/startup/cpu_asm.c
diff --git a/c/src/lib/libcpu/sh/sh7045/score/ispsh7045.c b/c/src/lib/libbsp/sh/gensh2/startup/ispsh7045.c
index bb0f9dc666..bb0f9dc666 100644
--- a/c/src/lib/libcpu/sh/sh7045/score/ispsh7045.c
+++ b/c/src/lib/libbsp/sh/gensh2/startup/ispsh7045.c
diff --git a/c/src/lib/libcpu/sh/sh7045/timer/timer.c b/c/src/lib/libbsp/sh/gensh2/timer/timer.c
index 152c99b1aa..152c99b1aa 100644
--- a/c/src/lib/libcpu/sh/sh7045/timer/timer.c
+++ b/c/src/lib/libbsp/sh/gensh2/timer/timer.c
diff --git a/c/src/lib/libcpu/sh/Makefile.am b/c/src/lib/libcpu/sh/Makefile.am
index 3422fd7032..0566cace11 100644
--- a/c/src/lib/libcpu/sh/Makefile.am
+++ b/c/src/lib/libcpu/sh/Makefile.am
@@ -9,45 +9,6 @@ cache_rel_SOURCES = ../shared/src/cache_manager.c
 cache_rel_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/cache
 cache_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-if sh7045
-# 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 = sh7045/include/io_types.h
-include_sh_HEADERS += sh7045/include/sci.h
-include_sh_HEADERS += sh7045/include/sh7_pfc.h
-include_sh_HEADERS += sh7045/include/sh7_sci.h
-include_sh_HEADERS += sh7045/include/sci_termios.h
-include_rtems_score_HEADERS = sh7045/include/ispsh7045.h
-include_rtems_score_HEADERS += sh7045/include/iosh7045.h
-
-## sh7045/clock
-noinst_PROGRAMS += sh7045/clock.rel
-sh7045_clock_rel_SOURCES = sh7045/clock/ckinit.c
-sh7045_clock_rel_CPPFLAGS = $(AM_CPPFLAGS)
-sh7045_clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-## sh7045/sci
-noinst_PROGRAMS += sh7045/sci.rel
-sh7045_sci_rel_SOURCES = sh7045/sci/sci.c sh7045/sci/sci_termios.c
-sh7045_sci_rel_CPPFLAGS = $(AM_CPPFLAGS)
-sh7045_sci_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-## sh7045/score
-noinst_PROGRAMS += sh7045/score.rel
-sh7045_score_rel_SOURCES = sh7045/score/cpu_asm.c sh7045/score/ispsh7045.c
-sh7045_score_rel_CPPFLAGS = $(AM_CPPFLAGS)
-sh7045_score_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-## sh7045/timer
-noinst_PROGRAMS += sh7045/timer.rel
-sh7045_timer_rel_SOURCES = sh7045/timer/timer.c
-sh7045_timer_rel_CPPFLAGS = $(AM_CPPFLAGS)
-sh7045_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-endif
-
 if sh7750
 # 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 105f695d02..4eb571731a 100644
--- a/c/src/lib/libcpu/sh/configure.ac
+++ b/c/src/lib/libcpu/sh/configure.ac
@@ -19,7 +19,6 @@ AM_PROG_CC_C_O
 RTEMS_CANONICALIZE_TOOLS
 RTEMS_PROG_CCAS
 
-AM_CONDITIONAL([sh7045],[test x"$RTEMS_CPU_MODEL" = x"sh7045"])
 AM_CONDITIONAL([sh7750],[test x"$RTEMS_CPU_MODEL" = x"sh7750"])
 
 RTEMS_AMPOLISH3
diff --git a/c/src/lib/libcpu/sh/preinstall.am b/c/src/lib/libcpu/sh/preinstall.am
index 163813ac13..62de4d75b0 100644
--- a/c/src/lib/libcpu/sh/preinstall.am
+++ b/c/src/lib/libcpu/sh/preinstall.am
@@ -13,45 +13,6 @@ all-am: $(PREINSTALL_FILES)
 PREINSTALL_FILES =
 CLEANFILES = $(PREINSTALL_FILES)
 
-if sh7045
-$(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/io_types.h: sh7045/include/io_types.h $(PROJECT_INCLUDE)/sh/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/io_types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/io_types.h
-
-$(PROJECT_INCLUDE)/sh/sci.h: sh7045/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: sh7045/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: sh7045/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)/sh/sci_termios.h: sh7045/include/sci_termios.h $(PROJECT_INCLUDE)/sh/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sci_termios.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sci_termios.h
-
-$(PROJECT_INCLUDE)/rtems/score/ispsh7045.h: sh7045/include/ispsh7045.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/ispsh7045.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/ispsh7045.h
-
-$(PROJECT_INCLUDE)/rtems/score/iosh7045.h: sh7045/include/iosh7045.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/iosh7045.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/iosh7045.h
-endif
 if sh7750
 $(PROJECT_INCLUDE)/sh/$(dirstamp):
 	@$(MKDIR_P) $(PROJECT_INCLUDE)/sh