7 files changed, 9 insertions, 214 deletions
diff --git a/c/src/lib/libbsp/nios2/configure.ac b/c/src/lib/libbsp/nios2/configure.ac
index b6f084b05b..ae0c31cd44 100644
--- a/c/src/lib/libbsp/nios2/configure.ac
+++ b/c/src/lib/libbsp/nios2/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-nios2],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([nios2_iss])
 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/nios2/nios2_iss/Makefile.am b/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am
index dcaa894afe..b3f66752a1 100644
--- a/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am
+++ b/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am
@@ -4,16 +4,8 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = bsp_specs
+dist_project_lib_DATA = startup/bsp_specs
 
-include_bspdir = $(includedir)/bsp
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
-nodist_include_bsp_HEADERS += ../../shared/include/console-polled.h
 DISTCLEANFILES = include/bspopts.h
 
 
@@ -26,11 +18,11 @@ crtnn.$(OBJEXT): start/crtnn.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT) crtnn.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
 
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
-libbsp_a_CPPFLAGS =
+libbsp_a_CPPFLAGS = $(AM_CPPFLAGS)
 
 # startup
 libbsp_a_SOURCES += ../../shared/bspclean.c
@@ -54,5 +46,5 @@ libbsp_a_SOURCES += timer/timer.c
 # Cache
 libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cache.rel
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/nios2/nios2_iss/headers.am
diff --git a/c/src/lib/libbsp/nios2/nios2_iss/configure.ac b/c/src/lib/libbsp/nios2/nios2_iss/configure.ac
index 3f0a261e11..2dd6eb202b 100644
--- a/c/src/lib/libbsp/nios2/nios2_iss/configure.ac
+++ b/c/src/lib/libbsp/nios2/nios2_iss/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-c-src-lib-libbsp-nios2-nios2_iss],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/nios2_iss.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/nios2/nios2_iss/include/bsp.h b/c/src/lib/libbsp/nios2/nios2_iss/include/bsp.h
deleted file mode 100644
index 3883e39ab6..0000000000
--- a/c/src/lib/libbsp/nios2/nios2_iss/include/bsp.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*  bsp.h
- *
- *  This include file contains all board IO definitions.
- *
- *  XXX : put yours in here
- *
- *  COPYRIGHT (c) 1989-1999.
- *  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_NIOS2_NIOS2_ISS_BSP_H
-#define LIBBSP_NIOS2_NIOS2_ISS_BSP_H
-
-#include <stdint.h>
-#include <bspopts.h>
-#include <bsp/default-initial-extension.h>
-
-#include <rtems.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* ============================================ */
-
-/* SOPC-specific Constants */
-
-#define SYSTEM_BUS_WIDTH 32
-
-#define JTAG_UART_BASE 0x08000000
-#define JTAG_UART_IRQ 2
-
-#define CLOCK_BASE 0x08001000
-#define CLOCK_FREQ 50000000
-#define CLOCK_VECTOR 1
-
-#define TIMER_BASE 0x08002000
-#define TIMER_FREQ 50000000
-#define TIMER_VECTOR 3
-
-/* ============================================ */
-
-#define NIOS2_BYPASS_CACHE ((uint32_t)0x80000000ul)
-#define NIOS2_IO_BASE(x) ( (void*) ((uint32_t)x | NIOS2_BYPASS_CACHE ) )
-#define NIOS2_IENABLE(x) do{ __builtin_wrctl(3,__builtin_rdctl(3)|x);}while(0)
-#define NIOS2_IRQ_ENABLE(x) do {__builtin_wrctl(3,__builtin_rdctl(3)|x);} while(0)
-
-/* ============================================ */
-/* TODO: Put this in an external header file */
-
-#ifndef SYSTEM_BUS_WIDTH
-#error SYSTEM_BUS_WIDTH is undefined
-#endif
-
-#if SYSTEM_BUS_WIDTH != 32
-#error Only SYSTEM_BUS_WIDTH 32 is supported
-#endif
-
-typedef struct
-{
-  volatile uint32_t status;
-  volatile uint32_t control;
-  volatile uint32_t period_lo;
-  volatile uint32_t period_hi;
-  volatile uint32_t snap_lo;
-  volatile uint32_t snap_hi;
-}
-altera_avalon_timer_regs;
-
-#define ALTERA_AVALON_TIMER_STATUS_TO_MSK             (0x1)
-#define ALTERA_AVALON_TIMER_STATUS_TO_OFST            (0)
-#define ALTERA_AVALON_TIMER_STATUS_RUN_MSK            (0x2)
-#define ALTERA_AVALON_TIMER_STATUS_RUN_OFST           (1)
-
-#define ALTERA_AVALON_TIMER_CONTROL_ITO_MSK           (0x1)
-#define ALTERA_AVALON_TIMER_CONTROL_ITO_OFST          (0)
-#define ALTERA_AVALON_TIMER_CONTROL_CONT_MSK          (0x2)
-#define ALTERA_AVALON_TIMER_CONTROL_CONT_OFST         (1)
-#define ALTERA_AVALON_TIMER_CONTROL_START_MSK         (0x4)
-#define ALTERA_AVALON_TIMER_CONTROL_START_OFST        (2)
-#define ALTERA_AVALON_TIMER_CONTROL_STOP_MSK          (0x8)
-#define ALTERA_AVALON_TIMER_CONTROL_STOP_OFST         (3)
-
-typedef struct
-{
-  volatile uint32_t data;
-  volatile uint32_t control;
-}
-altera_avalon_jtag_uart_regs;
-
-#define ALTERA_AVALON_JTAG_UART_DATA_DATA_MSK             (0x000000FFu)
-#define ALTERA_AVALON_JTAG_UART_DATA_DATA_OFST            (0)
-#define ALTERA_AVALON_JTAG_UART_DATA_RVALID_MSK           (0x00008000u)
-#define ALTERA_AVALON_JTAG_UART_DATA_RVALID_OFST          (15)
-#define ALTERA_AVALON_JTAG_UART_DATA_RAVAIL_MSK           (0xFFFF0000u)
-#define ALTERA_AVALON_JTAG_UART_DATA_RAVAIL_OFST          (16)
-
-#define ALTERA_AVALON_JTAG_UART_CONTROL_RE_MSK            (0x00000001u)
-#define ALTERA_AVALON_JTAG_UART_CONTROL_RE_OFST           (0)
-#define ALTERA_AVALON_JTAG_UART_CONTROL_WE_MSK            (0x00000002u)
-#define ALTERA_AVALON_JTAG_UART_CONTROL_WE_OFST           (1)
-#define ALTERA_AVALON_JTAG_UART_CONTROL_RI_MSK            (0x00000100u)
-#define ALTERA_AVALON_JTAG_UART_CONTROL_RI_OFST           (8)
-#define ALTERA_AVALON_JTAG_UART_CONTROL_WI_MSK            (0x00000200u)
-#define ALTERA_AVALON_JTAG_UART_CONTROL_WI_OFST           (9)
-#define ALTERA_AVALON_JTAG_UART_CONTROL_AC_MSK            (0x00000400u)
-#define ALTERA_AVALON_JTAG_UART_CONTROL_AC_OFST           (10)
-#define ALTERA_AVALON_JTAG_UART_CONTROL_WSPACE_MSK        (0xFFFF0000u)
-#define ALTERA_AVALON_JTAG_UART_CONTROL_WSPACE_OFST       (16)
-
-/* ============================================ */
-
-/* functions */
-
-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
-/* end of include file */
diff --git a/c/src/lib/libbsp/nios2/nios2_iss/include/tm27.h b/c/src/lib/libbsp/nios2/nios2_iss/include/tm27.h
deleted file mode 100644
index 0dfa7bf628..0000000000
--- a/c/src/lib/libbsp/nios2/nios2_iss/include/tm27.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <rtems/tm27-default.h>
diff --git a/c/src/lib/libbsp/nios2/nios2_iss/preinstall.am b/c/src/lib/libbsp/nios2/nios2_iss/preinstall.am
deleted file mode 100644
index 5f3e9a19ba..0000000000
--- a/c/src/lib/libbsp/nios2/nios2_iss/preinstall.am
+++ /dev/null
@@ -1,71 +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_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
-	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(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)/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_INCLUDE)/bsp/console-polled.h: ../../shared/include/console-polled.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/console-polled.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/console-polled.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/crtnn.$(OBJEXT): crtnn.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/crtnn.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/crtnn.$(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/nios2/nios2_iss/bsp_specs b/c/src/lib/libbsp/nios2/nios2_iss/startup/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/nios2/nios2_iss/bsp_specs
+++ b/c/src/lib/libbsp/nios2/nios2_iss/startup/bsp_specs