6 files changed, 4 insertions, 176 deletions
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/include/bsp.h b/c/src/lib/libbsp/sparc64/niagara/include/bsp.h
deleted file mode 100644
index 81058270a9..0000000000
--- a/c/src/lib/libbsp/sparc64/niagara/include/bsp.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*  bsp.h
- *
- *  This include file contains all SPARC64 simulator definitions.
- *
- *  COPYRIGHT (c) 1989-1998. On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
-
-#ifndef LIBBSP_SPARC64_NIAGARA_BSP_H
-#define LIBBSP_SPARC64_NIAGARA_BSP_H
-
-#include <bspopts.h>
-#include <bsp/default-initial-extension.h>
-
-#include <rtems.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* support for simulated clock tick */
-/*
-void *clock_driver_sim_idle_body(uintptr_t);
-#define BSP_IDLE_TASK_BODY clock_driver_sim_idle_body
-*/
-
-/* this should be defined somewhere */
-rtems_isr_entry set_vector(                     /* returns old vector */
-    rtems_isr_entry     handler,                /* isr routine        */
-    rtems_vector_number vector,                 /* vector number      */
-    int                 type                    /* RTEMS or RAW intr  */
-);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/c/src/lib/libbsp/sparc64/niagara/include/tm27.h b/c/src/lib/libbsp/sparc64/niagara/include/tm27.h
deleted file mode 100644
index 0dfa7bf628..0000000000
--- a/c/src/lib/libbsp/sparc64/niagara/include/tm27.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <rtems/tm27-default.h>
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