bsp/gensh2: Move libcpu files to BSP

Update #3254.

c/src/lib/libbsp/sh/gensh2/Makefile.am

@@ -2,6 +2,8 @@ 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
@@ -9,6 +11,15 @@ dist_project_lib_DATA = bsp_specs
 include_HEADERS = include/bsp.h
 include_HEADERS += include/tm27.h
 
+include_sh_HEADERS = include/sh/io_types.h
+include_sh_HEADERS += include/sh/sci.h
+include_sh_HEADERS += include/sh/sh7_pfc.h
+include_sh_HEADERS += include/sh/sh7_sci.h
+include_sh_HEADERS += include/sh/sci_termios.h
+
+include_rtems_score_HEADERS = include/rtems/score/ispsh7045.h
+include_rtems_score_HEADERS += include/rtems/score/iosh7045.h
+
 nodist_include_HEADERS = include/bspopts.h
 nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
@@ -41,19 +52,19 @@ libbsp_a_SOURCES += startup/hw_init.c \
     ../../shared/gnatinstallhandler.c ../../shared/bspclean.c \
     ../shared/bsphwinit.c
 libbsp_a_SOURCES += ../../shared/bspreset.c
+libbsp_a_SOURCES += clock/ckinit.c
+libbsp_a_SOURCES += startup/cpu_asm.c startup/ispsh7045.c
+libbsp_a_SOURCES += timer/timer.c
 # scitab
 libbsp_a_SOURCES += scitab.c
 # console
 libbsp_a_SOURCES += ../../sh/shared/console.c console/config.c
+libbsp_a_SOURCES += console/sci.c
+libbsp_a_SOURCES += console/sci_termios.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@/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

c/src/lib/libbsp/sh/gensh2/make/custom/gensh2.cfg

@@ -9,7 +9,6 @@
 include $(RTEMS_ROOT)/make/custom/default.cfg
 
 RTEMS_CPU=sh
-RTEMS_CPU_MODEL=sh7045
 
 #  This contains the compiler options necessary to select the CPU model
 #  and (hopefully) optimize for it.

c/src/lib/libbsp/sh/gensh2/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)
@@ -45,6 +55,34 @@ $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
 
+$(PROJECT_INCLUDE)/sh/io_types.h: include/sh/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: 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)/sh/sci_termios.h: include/sh/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: include/rtems/score/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: include/rtems/score/iosh7045.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/iosh7045.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/iosh7045.h
+
 $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h

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

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

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