8 files changed, 6 insertions, 250 deletions
diff --git a/c/src/lib/libbsp/mips/hurricane/Makefile.am b/c/src/lib/libbsp/mips/hurricane/Makefile.am
index c675d9f038..a634a84582 100644
--- a/c/src/lib/libbsp/mips/hurricane/Makefile.am
+++ b/c/src/lib/libbsp/mips/hurricane/Makefile.am
@@ -4,21 +4,9 @@ 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 += include/usc.h
-include_bsp_HEADERS = ../shared/liblnk/regs.h
 #isr
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += include/irq.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
 DISTCLEANFILES = include/bspopts.h
 
 
@@ -27,7 +15,7 @@ start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
@@ -71,5 +59,5 @@ libbsp_a_LIBADD  = ../../../libcpu/@RTEMS_CPU@/shared/cache.rel
 libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/interrupts.rel
 libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/rm52xx/timer.rel
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/mips/hurricane/headers.am
diff --git a/c/src/lib/libbsp/mips/hurricane/configure.ac b/c/src/lib/libbsp/mips/hurricane/configure.ac
index e66e8d2794..99d16d95b8 100644
--- a/c/src/lib/libbsp/mips/hurricane/configure.ac
+++ b/c/src/lib/libbsp/mips/hurricane/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-mips-hurricane],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/hurricane.cfg])
 RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
 
 RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/mips/hurricane/include/bsp.h b/c/src/lib/libbsp/mips/hurricane/include/bsp.h
deleted file mode 100644
index 1c9dc652f0..0000000000
--- a/c/src/lib/libbsp/mips/hurricane/include/bsp.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- *  @file
- */
-
-/*
- *  COPYRIGHT (c) 1989-2012.
- *  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_MIPS_HURRICANE_BSP_H
-#define LIBBSP_MIPS_HURRICANE_BSP_H
-
-#ifndef ASM
-
-#include <bspopts.h>
-#include <bsp/default-initial-extension.h>
-
-#include <rtems.h>
-#include <libcpu/rm5231.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern void WriteDisplay( char * string );
-
-extern uint32_t mips_get_timer( void );
-
-#define BSP_FEATURE_IRQ_EXTENSION
-#define BSP_SHARED_HANDLER_SUPPORT      1
-
-#define CPU_CLOCK_RATE_MHZ     (200)
-#define CLOCKS_PER_MICROSECOND ( CPU_CLOCK_RATE_MHZ ) /* equivalent to CPU clock speed in MHz */
-
-/*
- *  Simple spin delay in microsecond units for device drivers.
- *  This is very dependent on the clock speed of the target.
- *
- *  NOTE: This macro generates a warning like "integer constant out
- *        of range" which is safe to ignore.  In 64 bit mode, unsigned32
- *        types are actually 64 bits long so that comparisons between
- *        unsigned32 types and pointers are valid.  The warning is caused
- *        by code in the delay macro that is necessary for 64 bit mode.
- */
-
-#define rtems_bsp_delay( microseconds ) \
-  { \
-     uint32_t _end_clock = \
-          mips_get_timer() + microseconds * CLOCKS_PER_MICROSECOND; \
-     _end_clock %= 0x100000000;  /* make sure result is 32 bits */ \
-     \
-     /* handle timer overflow, if necessary */ \
-     while ( _end_clock < mips_get_timer() );  \
-     \
-     while ( _end_clock > mips_get_timer() ); \
-  }
-
-/* Constants */
-
-#define RAM_START 0
-#define RAM_END   0x100000
-
-/*
- * Prototypes for methods called from .S for dependency tracking
- */
-void init_tlb(void);
-void resettlb(int i);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !ASM */
-
-#endif	/* __HURRICANE_BSP_h */
diff --git a/c/src/lib/libbsp/mips/hurricane/include/irq.h b/c/src/lib/libbsp/mips/hurricane/include/irq.h
deleted file mode 100644
index 3347ecb2a6..0000000000
--- a/c/src/lib/libbsp/mips/hurricane/include/irq.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * @file
- *
- * @ingroup bsp_interrupt
- *
- * @brief interrupt definitions.
- */
-
-/*
- *  COPYRIGHT (c) 1989-2012.
- *  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_MIPS_XXX_IRQ_H
-#define LIBBSP_MIPS_XXX_IRQ_H
-
-#ifndef ASM
-  #include <rtems.h>
-  #include <rtems/irq.h>
-  #include <rtems/irq-extension.h>
-  #include <rtems/score/mips.h>
-#endif
-
-/**
- * @addtogroup bsp_interrupt
- *
- * @{
- */
-
-#define BSP_INTERRUPT_VECTOR_MIN    0
-#define RM5231_MAXIMUM_VECTORS      (MIPS_INTERRUPT_BASE+8)
-#define BSP_INTERRUPT_VECTOR_MAX    RM5231_MAXIMUM_VECTORS
-
-/** @} */
-
-#endif /* LIBBSP_MIPS_JMR3904_IRQ_H */
diff --git a/c/src/lib/libbsp/mips/hurricane/include/tm27.h b/c/src/lib/libbsp/mips/hurricane/include/tm27.h
deleted file mode 100644
index 0dfa7bf628..0000000000
--- a/c/src/lib/libbsp/mips/hurricane/include/tm27.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <rtems/tm27-default.h>
diff --git a/c/src/lib/libbsp/mips/hurricane/include/usc.h b/c/src/lib/libbsp/mips/hurricane/include/usc.h
deleted file mode 100644
index 167eff0949..0000000000
--- a/c/src/lib/libbsp/mips/hurricane/include/usc.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* USC constants */
-
-#ifndef _USC_H__
-#define _USC_H__
-
-
-#define USC_REG_BASE	(0x1D000000 | 0xA0000000)
-
-/* Internal register addresses */
-#define SYSTEM (USC_REG_BASE + 0x73)
-
-#define INT_CFG0 (USC_REG_BASE + 0xE0)
-#define INT_CFG1 (USC_REG_BASE + 0xE4)
-#define INT_CFG2 (USC_REG_BASE + 0xE8)
-#define INT_STAT (USC_REG_BASE + 0xEC)
-
-#define WD_HBI (USC_REG_BASE + 0xF4)
-
-#define INT_CFG3 (USC_REG_BASE + 0x158)
-
-/* INT_CFGx register masks */
-#define HBI_MASK	0x00200000	/* Heartbeat timer interrupt mask */
-#define WDI_MASK	0x00400000	/* Watchdog timer interrupt mask */
-#define MODE_TOTEM_POLE	0x20000000	/* Totem Pole Output Mode */
-
-/* WD_HBI register bits */
-#define WD_EN 0x00800000	/* Watchdog enable */
-#define HBI_4000_PS	0x00200000	/* Heartbeat timer prescaler = 4000 */
-#define WD_INIT 0x10	/* Watchdog reset pattern (written to byte 2 in WD_HBI register) */
-
-
-#endif /* _USC_H__ */
diff --git a/c/src/lib/libbsp/mips/hurricane/preinstall.am b/c/src/lib/libbsp/mips/hurricane/preinstall.am
deleted file mode 100644
index 8ad1e3f332..0000000000
--- a/c/src/lib/libbsp/mips/hurricane/preinstall.am
+++ /dev/null
@@ -1,83 +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)/usc.h: include/usc.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/usc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/usc.h
-
-$(PROJECT_INCLUDE)/bsp/regs.h: ../shared/liblnk/regs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/regs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/regs.h
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.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: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
diff --git a/c/src/lib/libbsp/mips/hurricane/bsp_specs b/c/src/lib/libbsp/mips/hurricane/startup/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/mips/hurricane/bsp_specs
+++ b/c/src/lib/libbsp/mips/hurricane/startup/bsp_specs