44 files changed, 13 insertions, 414 deletions
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/arch.h b/bsps/sparc64/include/arch/arch.h
index 5fdd4a2cb2..5fdd4a2cb2 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/arch.h
+++ b/bsps/sparc64/include/arch/arch.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/boot.h b/bsps/sparc64/include/arch/boot.h
index b0a997a957..b0a997a957 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/boot.h
+++ b/bsps/sparc64/include/arch/boot.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/cache_spec.h b/bsps/sparc64/include/arch/mm/cache_spec.h
index 1d9199db33..1d9199db33 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/cache_spec.h
+++ b/bsps/sparc64/include/arch/mm/cache_spec.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/frame.h b/bsps/sparc64/include/arch/mm/frame.h
index fb66e54bf1..fb66e54bf1 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/frame.h
+++ b/bsps/sparc64/include/arch/mm/frame.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/mmu.h b/bsps/sparc64/include/arch/mm/mmu.h
index 1d445f2e24..1d445f2e24 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/mmu.h
+++ b/bsps/sparc64/include/arch/mm/mmu.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/page.h b/bsps/sparc64/include/arch/mm/page.h
index f1451a2866..f1451a2866 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/page.h
+++ b/bsps/sparc64/include/arch/mm/page.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/frame.h b/bsps/sparc64/include/arch/mm/sun4u/frame.h
index e30f504d08..e30f504d08 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/frame.h
+++ b/bsps/sparc64/include/arch/mm/sun4u/frame.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/mmu.h b/bsps/sparc64/include/arch/mm/sun4u/mmu.h
index f887ebe7f4..f887ebe7f4 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/mmu.h
+++ b/bsps/sparc64/include/arch/mm/sun4u/mmu.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/page.h b/bsps/sparc64/include/arch/mm/sun4u/page.h
index f1451a2866..f1451a2866 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/page.h
+++ b/bsps/sparc64/include/arch/mm/sun4u/page.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/tlb.h b/bsps/sparc64/include/arch/mm/sun4u/tlb.h
index 6f6e6542e6..6f6e6542e6 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/tlb.h
+++ b/bsps/sparc64/include/arch/mm/sun4u/tlb.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/tte.h b/bsps/sparc64/include/arch/mm/sun4u/tte.h
index 46acaed47c..46acaed47c 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/sun4u/tte.h
+++ b/bsps/sparc64/include/arch/mm/sun4u/tte.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/tlb.h b/bsps/sparc64/include/arch/mm/tlb.h
index 4adf26ca64..4adf26ca64 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/tlb.h
+++ b/bsps/sparc64/include/arch/mm/tlb.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/tte.h b/bsps/sparc64/include/arch/mm/tte.h
index f0b746e8c6..f0b746e8c6 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/mm/tte.h
+++ b/bsps/sparc64/include/arch/mm/tte.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/regdef.h b/bsps/sparc64/include/arch/regdef.h
index aae46fa99f..aae46fa99f 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/regdef.h
+++ b/bsps/sparc64/include/arch/regdef.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/stack.h b/bsps/sparc64/include/arch/stack.h
index 6364916912..6364916912 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/stack.h
+++ b/bsps/sparc64/include/arch/stack.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/sun4u/arch.h b/bsps/sparc64/include/arch/sun4u/arch.h
index 9e883a37ff..9e883a37ff 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/sparc64/include/sun4u/arch.h
+++ b/bsps/sparc64/include/arch/sun4u/arch.h
diff --git a/c/src/lib/libbsp/sparc64/shared/include/asm.h b/bsps/sparc64/include/asm.h
index bd3cc1298a..bd3cc1298a 100644
--- a/c/src/lib/libbsp/sparc64/shared/include/asm.h
+++ b/bsps/sparc64/include/asm.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/align.h b/bsps/sparc64/include/boot/align.h
index 96229101ed..96229101ed 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/align.h
+++ b/bsps/sparc64/include/boot/align.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/balloc.h b/bsps/sparc64/include/boot/balloc.h
index 8e502c0c58..8e502c0c58 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/balloc.h
+++ b/bsps/sparc64/include/boot/balloc.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/gentypes.h b/bsps/sparc64/include/boot/gentypes.h
index a3e82d6eef..a3e82d6eef 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/gentypes.h
+++ b/bsps/sparc64/include/boot/gentypes.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/main.h b/bsps/sparc64/include/boot/main.h
index 5ddc814ac8..5ddc814ac8 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/main.h
+++ b/bsps/sparc64/include/boot/main.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/ofw.h b/bsps/sparc64/include/boot/ofw.h
index c562b675a2..c562b675a2 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/ofw.h
+++ b/bsps/sparc64/include/boot/ofw.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/ofw_tree.h b/bsps/sparc64/include/boot/ofw_tree.h
index 5872ade261..5872ade261 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/ofw_tree.h
+++ b/bsps/sparc64/include/boot/ofw_tree.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/ofwarch.h b/bsps/sparc64/include/boot/ofwarch.h
index 2d4f7643c0..2d4f7643c0 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/ofwarch.h
+++ b/bsps/sparc64/include/boot/ofwarch.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/register.h b/bsps/sparc64/include/boot/register.h
index 61bf34ac66..61bf34ac66 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/register.h
+++ b/bsps/sparc64/include/boot/register.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/stack.h b/bsps/sparc64/include/boot/stack.h
index 1486dd21b4..1486dd21b4 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/stack.h
+++ b/bsps/sparc64/include/boot/stack.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/types.h b/bsps/sparc64/include/boot/types.h
index 095e25233d..095e25233d 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/boot/include/types.h
+++ b/bsps/sparc64/include/boot/types.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/genarch/include/ofw/ofw_tree.h b/bsps/sparc64/include/genarch/ofw/ofw_tree.h
index f62d545527..f62d545527 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/genarch/include/ofw/ofw_tree.h
+++ b/bsps/sparc64/include/genarch/ofw/ofw_tree.h
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/generic/include/align.h b/bsps/sparc64/include/kernel/align.h
index 6003ea9c4e..6003ea9c4e 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/kernel/generic/include/align.h
+++ b/bsps/sparc64/include/kernel/align.h
diff --git a/c/src/lib/libbsp/sparc64/shared/include/traptable.h b/bsps/sparc64/include/traptable.h
index 353c60d79c..353c60d79c 100644
--- a/c/src/lib/libbsp/sparc64/shared/include/traptable.h
+++ b/bsps/sparc64/include/traptable.h
diff --git a/c/src/lib/libbsp/sparc64/niagara/include/bsp.h b/bsps/sparc64/niagara/include/bsp.h
index 81058270a9..81058270a9 100644
--- a/c/src/lib/libbsp/sparc64/niagara/include/bsp.h
+++ b/bsps/sparc64/niagara/include/bsp.h
diff --git a/c/src/lib/libbsp/sparc64/niagara/include/tm27.h b/bsps/sparc64/niagara/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/sparc64/niagara/include/tm27.h
+++ b/bsps/sparc64/niagara/include/tm27.h
diff --git a/c/src/lib/libbsp/sparc64/usiii/include/bsp.h b/bsps/sparc64/usiii/include/bsp.h
index 8051db3987..8051db3987 100644
--- a/c/src/lib/libbsp/sparc64/usiii/include/bsp.h
+++ b/bsps/sparc64/usiii/include/bsp.h
diff --git a/c/src/lib/libbsp/sparc64/usiii/include/tm27.h b/bsps/sparc64/usiii/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/sparc64/usiii/include/tm27.h
+++ b/bsps/sparc64/usiii/include/tm27.h
diff --git a/c/src/lib/libbsp/sparc64/Makefile.am b/c/src/lib/libbsp/sparc64/Makefile.am
index 526453030c..b0e0689014 100644
--- a/c/src/lib/libbsp/sparc64/Makefile.am
+++ b/c/src/lib/libbsp/sparc64/Makefile.am
@@ -5,3 +5,4 @@ _SUBDIRS = @RTEMS_BSP_FAMILY@
 
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
+include $(srcdir)/../../../../../bsps/sparc64/headers.am
diff --git a/c/src/lib/libbsp/sparc64/configure.ac b/c/src/lib/libbsp/sparc64/configure.ac
index dc62789228..4c696899f3 100644
--- a/c/src/lib/libbsp/sparc64/configure.ac
+++ b/c/src/lib/libbsp/sparc64/configure.ac
@@ -7,6 +7,8 @@ AC_INIT([rtems-c-src-lib-libbsp-sparc64],[_RTEMS_VERSION],[https://devel.rtems.o
 # AC_CONFIG_SRCDIR([shared])
 
 RTEMS_TOP(../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define foreign 1.12.2])
diff --git a/c/src/lib/libbsp/sparc64/niagara/Makefile.am b/c/src/lib/libbsp/sparc64/niagara/Makefile.am
index 0267cc9a6c..717dfdc638 100644
--- a/c/src/lib/libbsp/sparc64/niagara/Makefile.am
+++ b/c/src/lib/libbsp/sparc64/niagara/Makefile.am
@@ -4,28 +4,8 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
 
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h 
-include_HEADERS += include/tm27.h
-include_HEADERS += ../shared/include/asm.h
-
-include_bootdir = $(includedir)/boot
-include_boot_HEADERS = ../shared/helenos/boot/include/align.h \
-  ../shared/helenos/boot/include/balloc.h \
-  ../shared/helenos/boot/include/gentypes.h \
-  ../shared/helenos/boot/include/main.h \
-  ../shared/helenos/boot/include/ofwarch.h \
-  ../shared/helenos/boot/include/ofw.h \
-  ../shared/helenos/boot/include/ofw_tree.h \
-  ../shared/helenos/boot/include/register.h \
-  ../shared/helenos/boot/include/stack.h \
-  ../shared/helenos/boot/include/types.h
-
-nodist_include_HEADERS = include/bspopts.h    
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h 
 DISTCLEANFILES = include/bspopts.h
 noinst_PROGRAMS =
 
@@ -75,5 +55,5 @@ libbsp_a_LIBADD = \
       ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
       ../../../libcpu/@RTEMS_CPU@/shared/sparc64-syscall.rel 
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/sparc64/niagara/headers.am
diff --git a/c/src/lib/libbsp/sparc64/niagara/configure.ac b/c/src/lib/libbsp/sparc64/niagara/configure.ac
index 761700175e..cd5d26121e 100644
--- a/c/src/lib/libbsp/sparc64/niagara/configure.ac
+++ b/c/src/lib/libbsp/sparc64/niagara/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-sparc64-sun4v],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/niagara.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/sparc64/niagara/preinstall.am b/c/src/lib/libbsp/sparc64/niagara/preinstall.am
deleted file mode 100644
index d2c8f3b3b8..0000000000
--- a/c/src/lib/libbsp/sparc64/niagara/preinstall.am
+++ /dev/null
@@ -1,112 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/asm.h: ../shared/include/asm.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/asm.h
-
-$(PROJECT_INCLUDE)/boot/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/boot
-	@: > $(PROJECT_INCLUDE)/boot/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/boot/$(dirstamp)
-
-$(PROJECT_INCLUDE)/boot/align.h: ../shared/helenos/boot/include/align.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/align.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/align.h
-
-$(PROJECT_INCLUDE)/boot/balloc.h: ../shared/helenos/boot/include/balloc.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/balloc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/balloc.h
-
-$(PROJECT_INCLUDE)/boot/gentypes.h: ../shared/helenos/boot/include/gentypes.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/gentypes.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/gentypes.h
-
-$(PROJECT_INCLUDE)/boot/main.h: ../shared/helenos/boot/include/main.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/main.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/main.h
-
-$(PROJECT_INCLUDE)/boot/ofwarch.h: ../shared/helenos/boot/include/ofwarch.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/ofwarch.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/ofwarch.h
-
-$(PROJECT_INCLUDE)/boot/ofw.h: ../shared/helenos/boot/include/ofw.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/ofw.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/ofw.h
-
-$(PROJECT_INCLUDE)/boot/ofw_tree.h: ../shared/helenos/boot/include/ofw_tree.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/ofw_tree.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/ofw_tree.h
-
-$(PROJECT_INCLUDE)/boot/register.h: ../shared/helenos/boot/include/register.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/register.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/register.h
-
-$(PROJECT_INCLUDE)/boot/stack.h: ../shared/helenos/boot/include/stack.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/stack.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/stack.h
-
-$(PROJECT_INCLUDE)/boot/types.h: ../shared/helenos/boot/include/types.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/types.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: ../shared/startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
diff --git a/c/src/lib/libbsp/sparc64/niagara/bsp_specs b/c/src/lib/libbsp/sparc64/niagara/startup/bsp_specs
index 0b4b0db932..0b4b0db932 100644
--- a/c/src/lib/libbsp/sparc64/niagara/bsp_specs
+++ b/c/src/lib/libbsp/sparc64/niagara/startup/bsp_specs
diff --git a/c/src/lib/libbsp/sparc64/usiii/Makefile.am b/c/src/lib/libbsp/sparc64/usiii/Makefile.am
index 90be322b0d..cf2828a015 100644
--- a/c/src/lib/libbsp/sparc64/usiii/Makefile.am
+++ b/c/src/lib/libbsp/sparc64/usiii/Makefile.am
@@ -4,74 +4,16 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
-
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h 
-include_HEADERS += include/tm27.h
-include_HEADERS += ../shared/include/asm.h 
-include_HEADERS += ../shared/include/traptable.h 
+dist_project_lib_DATA = startup/bsp_specs
 
 ## these are the include files used by the boot process from HelenOS Sparc64
-include_bootdir = $(includedir)/boot
-include_boot_HEADERS = \
-  ../shared/helenos/boot/include/align.h \
-  ../shared/helenos/boot/include/balloc.h \
-  ../shared/helenos/boot/include/gentypes.h \
-  ../shared/helenos/boot/include/main.h \
-  ../shared/helenos/boot/include/ofwarch.h \
-  ../shared/helenos/boot/include/ofw.h \
-  ../shared/helenos/boot/include/ofw_tree.h \
-  ../shared/helenos/boot/include/register.h \
-  ../shared/helenos/boot/include/stack.h \
-  ../shared/helenos/boot/include/types.h 
-
 ## These include files mimic the HelenOS kernel include layout, which 
 ## in HelenOS-0.4.2 is more complicated than the boot include dirs.
 
 # assumed by the HelenOS sources to be in the root includedir. We place them
 # in a kernel include directory.
-include_kerneldir = $(includedir)/kernel
-include_kernel_HEADERS = \
-  ../shared/helenos/kernel/generic/include/align.h
-
-include_archdir = $(includedir)/arch
-include_arch_HEADERS = \
-  ../shared/helenos/kernel/sparc64/include/arch.h \
-  ../shared/helenos/kernel/sparc64/include/boot.h \
-  ../shared/helenos/kernel/sparc64/include/regdef.h \
-  ../shared/helenos/kernel/sparc64/include/stack.h 
-
-include_arch_sun4udir = $(includedir)/arch/sun4u
-include_arch_sun4u_HEADERS = \
-  ../shared/helenos/kernel/sparc64/include/sun4u/arch.h 
-
-include_arch_mmdir = $(includedir)/arch/mm
-include_arch_mm_HEADERS = \
-  ../shared/helenos/kernel/sparc64/include/mm/cache_spec.h \
-  ../shared/helenos/kernel/sparc64/include/mm/frame.h \
-  ../shared/helenos/kernel/sparc64/include/mm/mmu.h \
-  ../shared/helenos/kernel/sparc64/include/mm/page.h \
-  ../shared/helenos/kernel/sparc64/include/mm/tlb.h \
-  ../shared/helenos/kernel/sparc64/include/mm/tte.h
-
-
-include_arch_mm_sun4udir = $(includedir)/arch/mm/sun4u
-include_arch_mm_sun4u_HEADERS = \
-  ../shared/helenos/kernel/sparc64/include/mm/sun4u/frame.h \
-  ../shared/helenos/kernel/sparc64/include/mm/sun4u/mmu.h \
-  ../shared/helenos/kernel/sparc64/include/mm/sun4u/page.h \
-  ../shared/helenos/kernel/sparc64/include/mm/sun4u/tlb.h \
-  ../shared/helenos/kernel/sparc64/include/mm/sun4u/tte.h
-
-include_genarch_ofwdir = $(includedir)/genarch/ofw
-include_genarch_ofw_HEADERS = \
-  ../shared/helenos/kernel/genarch/include/ofw/ofw_tree.h
-
-
-nodist_include_HEADERS = include/bspopts.h    
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h 
+
+
 DISTCLEANFILES = include/bspopts.h
 noinst_PROGRAMS =
 
@@ -127,5 +69,5 @@ libbsp_a_LIBADD = \
       ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
       ../../../libcpu/@RTEMS_CPU@/shared/sparc64-syscall.rel 
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/sparc64/usiii/headers.am
diff --git a/c/src/lib/libbsp/sparc64/usiii/configure.ac b/c/src/lib/libbsp/sparc64/usiii/configure.ac
index 1d183d2a63..a95c48fd8b 100644
--- a/c/src/lib/libbsp/sparc64/usiii/configure.ac
+++ b/c/src/lib/libbsp/sparc64/usiii/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-sparc64-sun4u],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/usiii.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/sparc64/usiii/preinstall.am b/c/src/lib/libbsp/sparc64/usiii/preinstall.am
deleted file mode 100644
index fa403a3842..0000000000
--- a/c/src/lib/libbsp/sparc64/usiii/preinstall.am
+++ /dev/null
@@ -1,218 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
-	$(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/asm.h: ../shared/include/asm.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/asm.h
-
-$(PROJECT_INCLUDE)/traptable.h: ../shared/include/traptable.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/traptable.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/traptable.h
-
-$(PROJECT_INCLUDE)/boot/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/boot
-	@: > $(PROJECT_INCLUDE)/boot/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/boot/$(dirstamp)
-
-$(PROJECT_INCLUDE)/boot/align.h: ../shared/helenos/boot/include/align.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/align.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/align.h
-
-$(PROJECT_INCLUDE)/boot/balloc.h: ../shared/helenos/boot/include/balloc.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/balloc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/balloc.h
-
-$(PROJECT_INCLUDE)/boot/gentypes.h: ../shared/helenos/boot/include/gentypes.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/gentypes.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/gentypes.h
-
-$(PROJECT_INCLUDE)/boot/main.h: ../shared/helenos/boot/include/main.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/main.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/main.h
-
-$(PROJECT_INCLUDE)/boot/ofwarch.h: ../shared/helenos/boot/include/ofwarch.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/ofwarch.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/ofwarch.h
-
-$(PROJECT_INCLUDE)/boot/ofw.h: ../shared/helenos/boot/include/ofw.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/ofw.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/ofw.h
-
-$(PROJECT_INCLUDE)/boot/ofw_tree.h: ../shared/helenos/boot/include/ofw_tree.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/ofw_tree.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/ofw_tree.h
-
-$(PROJECT_INCLUDE)/boot/register.h: ../shared/helenos/boot/include/register.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/register.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/register.h
-
-$(PROJECT_INCLUDE)/boot/stack.h: ../shared/helenos/boot/include/stack.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/stack.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/stack.h
-
-$(PROJECT_INCLUDE)/boot/types.h: ../shared/helenos/boot/include/types.h $(PROJECT_INCLUDE)/boot/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/boot/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/boot/types.h
-
-$(PROJECT_INCLUDE)/kernel/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/kernel
-	@: > $(PROJECT_INCLUDE)/kernel/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/kernel/$(dirstamp)
-
-$(PROJECT_INCLUDE)/kernel/align.h: ../shared/helenos/kernel/generic/include/align.h $(PROJECT_INCLUDE)/kernel/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/kernel/align.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/kernel/align.h
-
-$(PROJECT_INCLUDE)/arch/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/arch
-	@: > $(PROJECT_INCLUDE)/arch/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/arch/$(dirstamp)
-
-$(PROJECT_INCLUDE)/arch/arch.h: ../shared/helenos/kernel/sparc64/include/arch.h $(PROJECT_INCLUDE)/arch/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/arch.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/arch.h
-
-$(PROJECT_INCLUDE)/arch/boot.h: ../shared/helenos/kernel/sparc64/include/boot.h $(PROJECT_INCLUDE)/arch/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/boot.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/boot.h
-
-$(PROJECT_INCLUDE)/arch/regdef.h: ../shared/helenos/kernel/sparc64/include/regdef.h $(PROJECT_INCLUDE)/arch/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/regdef.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/regdef.h
-
-$(PROJECT_INCLUDE)/arch/stack.h: ../shared/helenos/kernel/sparc64/include/stack.h $(PROJECT_INCLUDE)/arch/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/stack.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/stack.h
-
-$(PROJECT_INCLUDE)/arch/sun4u/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/arch/sun4u
-	@: > $(PROJECT_INCLUDE)/arch/sun4u/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/arch/sun4u/$(dirstamp)
-
-$(PROJECT_INCLUDE)/arch/sun4u/arch.h: ../shared/helenos/kernel/sparc64/include/sun4u/arch.h $(PROJECT_INCLUDE)/arch/sun4u/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/sun4u/arch.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/sun4u/arch.h
-
-$(PROJECT_INCLUDE)/arch/mm/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/arch/mm
-	@: > $(PROJECT_INCLUDE)/arch/mm/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/arch/mm/$(dirstamp)
-
-$(PROJECT_INCLUDE)/arch/mm/cache_spec.h: ../shared/helenos/kernel/sparc64/include/mm/cache_spec.h $(PROJECT_INCLUDE)/arch/mm/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/mm/cache_spec.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/mm/cache_spec.h
-
-$(PROJECT_INCLUDE)/arch/mm/frame.h: ../shared/helenos/kernel/sparc64/include/mm/frame.h $(PROJECT_INCLUDE)/arch/mm/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/mm/frame.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/mm/frame.h
-
-$(PROJECT_INCLUDE)/arch/mm/mmu.h: ../shared/helenos/kernel/sparc64/include/mm/mmu.h $(PROJECT_INCLUDE)/arch/mm/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/mm/mmu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/mm/mmu.h
-
-$(PROJECT_INCLUDE)/arch/mm/page.h: ../shared/helenos/kernel/sparc64/include/mm/page.h $(PROJECT_INCLUDE)/arch/mm/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/mm/page.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/mm/page.h
-
-$(PROJECT_INCLUDE)/arch/mm/tlb.h: ../shared/helenos/kernel/sparc64/include/mm/tlb.h $(PROJECT_INCLUDE)/arch/mm/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/mm/tlb.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/mm/tlb.h
-
-$(PROJECT_INCLUDE)/arch/mm/tte.h: ../shared/helenos/kernel/sparc64/include/mm/tte.h $(PROJECT_INCLUDE)/arch/mm/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/mm/tte.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/mm/tte.h
-
-$(PROJECT_INCLUDE)/arch/mm/sun4u/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/arch/mm/sun4u
-	@: > $(PROJECT_INCLUDE)/arch/mm/sun4u/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/arch/mm/sun4u/$(dirstamp)
-
-$(PROJECT_INCLUDE)/arch/mm/sun4u/frame.h: ../shared/helenos/kernel/sparc64/include/mm/sun4u/frame.h $(PROJECT_INCLUDE)/arch/mm/sun4u/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/mm/sun4u/frame.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/mm/sun4u/frame.h
-
-$(PROJECT_INCLUDE)/arch/mm/sun4u/mmu.h: ../shared/helenos/kernel/sparc64/include/mm/sun4u/mmu.h $(PROJECT_INCLUDE)/arch/mm/sun4u/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/mm/sun4u/mmu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/mm/sun4u/mmu.h
-
-$(PROJECT_INCLUDE)/arch/mm/sun4u/page.h: ../shared/helenos/kernel/sparc64/include/mm/sun4u/page.h $(PROJECT_INCLUDE)/arch/mm/sun4u/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/mm/sun4u/page.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/mm/sun4u/page.h
-
-$(PROJECT_INCLUDE)/arch/mm/sun4u/tlb.h: ../shared/helenos/kernel/sparc64/include/mm/sun4u/tlb.h $(PROJECT_INCLUDE)/arch/mm/sun4u/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/mm/sun4u/tlb.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/mm/sun4u/tlb.h
-
-$(PROJECT_INCLUDE)/arch/mm/sun4u/tte.h: ../shared/helenos/kernel/sparc64/include/mm/sun4u/tte.h $(PROJECT_INCLUDE)/arch/mm/sun4u/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arch/mm/sun4u/tte.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/arch/mm/sun4u/tte.h
-
-$(PROJECT_INCLUDE)/genarch/ofw/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/genarch/ofw
-	@: > $(PROJECT_INCLUDE)/genarch/ofw/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/genarch/ofw/$(dirstamp)
-
-$(PROJECT_INCLUDE)/genarch/ofw/ofw_tree.h: ../shared/helenos/kernel/genarch/include/ofw/ofw_tree.h $(PROJECT_INCLUDE)/genarch/ofw/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/genarch/ofw/ofw_tree.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/genarch/ofw/ofw_tree.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: ../shared/startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
diff --git a/c/src/lib/libbsp/sparc64/usiii/bsp_specs b/c/src/lib/libbsp/sparc64/usiii/startup/bsp_specs
index 0b4b0db932..0b4b0db932 100644
--- a/c/src/lib/libbsp/sparc64/usiii/bsp_specs
+++ b/c/src/lib/libbsp/sparc64/usiii/startup/bsp_specs