bsp/gensh1: Move libcpu files to BSP

Update #3254.

14 files changed, 1 insertions, 76 deletions

diff --git a/c/src/lib/libcpu/sh/sh7032/clock/ckinit.c b/c/src/lib/libbsp/sh/gensh1/clock/ckinit.c
index 6faaf27f58..6faaf27f58 100644
--- a/c/src/lib/libcpu/sh/sh7032/clock/ckinit.c
+++ b/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
index 085771f777..085771f777 100644
--- a/c/src/lib/libcpu/sh/sh7032/delay/delay.c
+++ b/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
index 04d9ca5c70..04d9ca5c70 100644
--- a/c/src/lib/libcpu/sh/sh7032/sci/sci.c
+++ b/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
index 3750024a64..3750024a64 100644
--- a/c/src/lib/libcpu/sh/sh7032/include/iosh7032.h
+++ b/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
index 9c7cee8bd6..9c7cee8bd6 100644
--- a/c/src/lib/libcpu/sh/sh7032/include/ispsh7032.h
+++ b/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
index 5653afca3c..5653afca3c 100644
--- a/c/src/lib/libcpu/sh/sh7032/include/sci.h
+++ b/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
index 1045af6af8..1045af6af8 100644
--- a/c/src/lib/libcpu/sh/sh7032/include/sh7_pfc.h
+++ b/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
index 0b80a485d3..0b80a485d3 100644
--- a/c/src/lib/libcpu/sh/sh7032/include/sh7_sci.h
+++ b/c/src/lib/libbsp/sh/gensh1/include/sh/sh7_sci.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
index 99d9cc9a6a..99d9cc9a6a 100644
--- a/c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c
+++ b/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
index 0240a5df26..0240a5df26 100644
--- a/c/src/lib/libcpu/sh/sh7032/score/ispsh7032.c
+++ b/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
index 94a834cb1e..94a834cb1e 100644
--- a/c/src/lib/libcpu/sh/sh7032/timer/timer.c
+++ b/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 6e1576294b..3422fd7032 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 c3172a228c..105f695d02 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 9b12347225..163813ac13 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