14 files changed, 49 insertions, 7 deletions
diff --git a/c/src/lib/libbsp/sh/gensh4/Makefile.am b/c/src/lib/libbsp/sh/gensh4/Makefile.am
index a1c8c85119..4897d32a3f 100644
--- a/c/src/lib/libbsp/sh/gensh4/Makefile.am
+++ b/c/src/lib/libbsp/sh/gensh4/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,14 @@ dist_project_lib_DATA = bsp_specs
 include_HEADERS = include/bsp.h
 include_HEADERS += include/tm27.h
 
+include_sh_HEADERS = include/sh/sh4uart.h
+
+include_rtems_score_HEADERS = include/rtems/score/sh7750_regs.h
+include_rtems_score_HEADERS += include/rtems/score/ipl.h
+include_rtems_score_HEADERS += include/rtems/score/iosh7750.h
+include_rtems_score_HEADERS += include/rtems/score/ispsh7750.h
+include_rtems_score_HEADERS += include/rtems/score/sh4_regs.h
+
 nodist_include_HEADERS = include/bspopts.h
 nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
@@ -33,17 +43,16 @@ libbsp_a_SOURCES += \
     ../../shared/getentropy-cpucounter.c \
     ../../shared/gnatinstallhandler.c ../shared/bsphwinit.c
 libbsp_a_SOURCES += ../../shared/bspreset.c
+libbsp_a_SOURCES += startup/cpu_asm.c startup/ispsh7750.c
+libbsp_a_SOURCES += clock/ckinit.c
+libbsp_a_SOURCES += timer/timer.c
 # console
 libbsp_a_SOURCES += console/console.c ../../shared/dummy_printk_support.c
+libbsp_a_SOURCES += console/sh4uart.c
 # hw_init
 libbsp_a_SOURCES += hw_init/hw_init.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
 
 EXTRA_DIST = times
 
diff --git a/c/src/lib/libcpu/sh/sh7750/clock/ckinit.c b/c/src/lib/libbsp/sh/gensh4/clock/ckinit.c
index 795203d2d9..795203d2d9 100644
--- a/c/src/lib/libcpu/sh/sh7750/clock/ckinit.c
+++ b/c/src/lib/libbsp/sh/gensh4/clock/ckinit.c
diff --git a/c/src/lib/libcpu/sh/sh7750/sci/sh4uart.c b/c/src/lib/libbsp/sh/gensh4/console/sh4uart.c
index 7acc1de337..7acc1de337 100644
--- a/c/src/lib/libcpu/sh/sh7750/sci/sh4uart.c
+++ b/c/src/lib/libbsp/sh/gensh4/console/sh4uart.c
diff --git a/c/src/lib/libcpu/sh/sh7750/include/rtems/score/iosh7750.h b/c/src/lib/libbsp/sh/gensh4/include/rtems/score/iosh7750.h
index c5c532dbc2..c5c532dbc2 100644
--- a/c/src/lib/libcpu/sh/sh7750/include/rtems/score/iosh7750.h
+++ b/c/src/lib/libbsp/sh/gensh4/include/rtems/score/iosh7750.h
diff --git a/c/src/lib/libcpu/sh/sh7750/include/rtems/score/ipl.h b/c/src/lib/libbsp/sh/gensh4/include/rtems/score/ipl.h
index 9ce2d87e0e..9ce2d87e0e 100644
--- a/c/src/lib/libcpu/sh/sh7750/include/rtems/score/ipl.h
+++ b/c/src/lib/libbsp/sh/gensh4/include/rtems/score/ipl.h
diff --git a/c/src/lib/libcpu/sh/sh7750/include/rtems/score/ispsh7750.h b/c/src/lib/libbsp/sh/gensh4/include/rtems/score/ispsh7750.h
index 396644a241..396644a241 100644
--- a/c/src/lib/libcpu/sh/sh7750/include/rtems/score/ispsh7750.h
+++ b/c/src/lib/libbsp/sh/gensh4/include/rtems/score/ispsh7750.h
diff --git a/c/src/lib/libcpu/sh/sh7750/include/rtems/score/sh4_regs.h b/c/src/lib/libbsp/sh/gensh4/include/rtems/score/sh4_regs.h
index 074dc6d7a1..074dc6d7a1 100644
--- a/c/src/lib/libcpu/sh/sh7750/include/rtems/score/sh4_regs.h
+++ b/c/src/lib/libbsp/sh/gensh4/include/rtems/score/sh4_regs.h
diff --git a/c/src/lib/libcpu/sh/sh7750/include/rtems/score/sh7750_regs.h b/c/src/lib/libbsp/sh/gensh4/include/rtems/score/sh7750_regs.h
index b65f9b6e51..b65f9b6e51 100644
--- a/c/src/lib/libcpu/sh/sh7750/include/rtems/score/sh7750_regs.h
+++ b/c/src/lib/libbsp/sh/gensh4/include/rtems/score/sh7750_regs.h
diff --git a/c/src/lib/libcpu/sh/sh7750/include/sh/sh4uart.h b/c/src/lib/libbsp/sh/gensh4/include/sh/sh4uart.h
index 1e7a486eb8..1e7a486eb8 100644
--- a/c/src/lib/libcpu/sh/sh7750/include/sh/sh4uart.h
+++ b/c/src/lib/libbsp/sh/gensh4/include/sh/sh4uart.h
diff --git a/c/src/lib/libbsp/sh/gensh4/make/custom/gensh4.cfg b/c/src/lib/libbsp/sh/gensh4/make/custom/gensh4.cfg
index 4eb20f9612..016262f11e 100644
--- a/c/src/lib/libbsp/sh/gensh4/make/custom/gensh4.cfg
+++ b/c/src/lib/libbsp/sh/gensh4/make/custom/gensh4.cfg
@@ -9,7 +9,6 @@
 include $(RTEMS_ROOT)/make/custom/default.cfg
 
 RTEMS_CPU=sh
-RTEMS_CPU_MODEL=sh7750
 
 #  This contains the compiler options necessary to select the CPU model
 #  and (hopefully) optimize for it.
diff --git a/c/src/lib/libbsp/sh/gensh4/preinstall.am b/c/src/lib/libbsp/sh/gensh4/preinstall.am
index a8c5fbcd9e..70723c34fe 100644
--- a/c/src/lib/libbsp/sh/gensh4/preinstall.am
+++ b/c/src/lib/libbsp/sh/gensh4/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,30 @@ $(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/sh4uart.h: include/sh/sh4uart.h $(PROJECT_INCLUDE)/sh/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sh4uart.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sh4uart.h
+
+$(PROJECT_INCLUDE)/rtems/score/sh7750_regs.h: include/rtems/score/sh7750_regs.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/sh7750_regs.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/sh7750_regs.h
+
+$(PROJECT_INCLUDE)/rtems/score/ipl.h: include/rtems/score/ipl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/ipl.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/ipl.h
+
+$(PROJECT_INCLUDE)/rtems/score/iosh7750.h: include/rtems/score/iosh7750.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/iosh7750.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/iosh7750.h
+
+$(PROJECT_INCLUDE)/rtems/score/ispsh7750.h: include/rtems/score/ispsh7750.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/ispsh7750.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/ispsh7750.h
+
+$(PROJECT_INCLUDE)/rtems/score/sh4_regs.h: include/rtems/score/sh4_regs.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/sh4_regs.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/sh4_regs.h
+
 $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
diff --git a/c/src/lib/libcpu/sh/sh7750/score/cpu_asm.c b/c/src/lib/libbsp/sh/gensh4/startup/cpu_asm.c
index 52a033bb75..52a033bb75 100644
--- a/c/src/lib/libcpu/sh/sh7750/score/cpu_asm.c
+++ b/c/src/lib/libbsp/sh/gensh4/startup/cpu_asm.c
diff --git a/c/src/lib/libcpu/sh/sh7750/score/ispsh7750.c b/c/src/lib/libbsp/sh/gensh4/startup/ispsh7750.c
index 33fce3f461..33fce3f461 100644
--- a/c/src/lib/libcpu/sh/sh7750/score/ispsh7750.c
+++ b/c/src/lib/libbsp/sh/gensh4/startup/ispsh7750.c
diff --git a/c/src/lib/libcpu/sh/sh7750/timer/timer.c b/c/src/lib/libbsp/sh/gensh4/timer/timer.c
index ef462c780c..ef462c780c 100644
--- a/c/src/lib/libcpu/sh/sh7750/timer/timer.c
+++ b/c/src/lib/libbsp/sh/gensh4/timer/timer.c