9 files changed, 8 insertions, 395 deletions
diff --git a/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am b/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am
index 015391522a..d5a4b74b33 100644
--- a/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am
+++ b/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am
@@ -10,34 +10,12 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
-include_libcpudir = $(includedir)/libcpu
-
-dist_project_lib_DATA = bsp_specs
+dist_project_lib_DATA = startup/bsp_specs
 
 ###############################################################################
 #                  Header                                                     #
 ###############################################################################
 
-include_bsp_HEADERS =
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
-include_bsp_HEADERS += ../shared/include/linker-symbols.h
-include_bsp_HEADERS += ../../../libbsp/shared/include/mm.h
-include_bsp_HEADERS += ../../shared/include/utility.h
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += ../../shared/include/stackalloc.h
-include_bsp_HEADERS += ../../shared/include/uart-output-char.h
-include_bsp_HEADERS += ../shared/include/cache_.h
-include_bsp_HEADERS += include/irq.h
-include_bsp_HEADERS += include/uart.h
-include_bsp_HEADERS += include/generic_or1k.h
-
-nodist_include_HEADERS = include/bspopts.h
-
 ###############################################################################
 #                  Data                                                       #
 ###############################################################################
@@ -47,8 +25,8 @@ start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-project_lib_DATA += startup/linkcmds
-project_lib_DATA += ../shared/startup/linkcmds.base
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += ../shared/startup/linkcmds.base
 
 ###############################################################################
 #                  LibBSP                                                     #
@@ -57,7 +35,7 @@ project_lib_DATA += ../shared/startup/linkcmds.base
 noinst_LIBRARIES = libbsp.a
 
 libbsp_a_SOURCES =
-libbsp_a_CPPFLAGS =
+libbsp_a_CPPFLAGS = $(AM_CPPFLAGS)
 libbsp_a_LIBADD =
 
 # Startup
@@ -104,5 +82,5 @@ libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cache.rel
 
 DISTCLEANFILES = include/bspopts.h
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/or1k/generic_or1k/headers.am
diff --git a/c/src/lib/libbsp/or1k/generic_or1k/configure.ac b/c/src/lib/libbsp/or1k/generic_or1k/configure.ac
index a24e219a9e..d519fc4381 100644
--- a/c/src/lib/libbsp/or1k/generic_or1k/configure.ac
+++ b/c/src/lib/libbsp/or1k/generic_or1k/configure.ac
@@ -8,6 +8,9 @@ AC_PREREQ(2.69)
 AC_INIT([rtems-c-src-lib-libbsp-or1k-generic],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/generic_or1k.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])
@@ -24,7 +27,6 @@ RTEMS_CANONICALIZE_TOOLS
 RTEMS_PROG_CCAS
 
 RTEMS_BSP_CLEANUP_OPTIONS
-RTEMS_BSP_LINKCMDS
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/c/src/lib/libbsp/or1k/generic_or1k/include/bsp.h b/c/src/lib/libbsp/or1k/generic_or1k/include/bsp.h
deleted file mode 100644
index 16839930a4..0000000000
--- a/c/src/lib/libbsp/or1k/generic_or1k/include/bsp.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * @file
- *
- * @ingroup generic_or1k
- *
- * @brief Global BSP definitions.
- */
-
-/*
- * COPYRIGHT (c) 2014-2015 Hesham ALMatary <heshamelmatary@gmail.com>
- *
- * 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_GENERIC_OR1K_H
-#define LIBBSP_GENERIC_OR1K_H
-
-#include <bspopts.h>
-#include <rtems.h>
-#include <bsp/generic_or1k.h>
-
-#include <bsp/default-initial-extension.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define BSP_FEATURE_IRQ_EXTENSION
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* LIBBSP_GENERIC_OR1K_H */
-
-/**
- * @defgroup generic_or1k support
- *
- * @ingroup bsp_or1k
- *
- * @brief generic_or1k support package
- *
- */
diff --git a/c/src/lib/libbsp/or1k/generic_or1k/include/generic_or1k.h b/c/src/lib/libbsp/or1k/generic_or1k/include/generic_or1k.h
deleted file mode 100644
index e4d9760640..0000000000
--- a/c/src/lib/libbsp/or1k/generic_or1k/include/generic_or1k.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/**
- * @file
- *
- * @ingroup generic_or1k_reg
- *
- * @brief Register definitions.
- */
-
-/*
- * COPYRIGHT (c) 2014-2015 Hesham ALMatary <heshamelmatary@gmail.com>
- *
- * 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_GENERIC_OR1K_H
-#define LIBBSP_GENERIC_OR1K_H
-
-#include <stdint.h>
-
-/**
- * @defgroup generic_or1k_reg Register Definitions
- *
- * @ingroup generic_or1k
- *
- * @brief Shared register definitions for or1k systems.
- *
- * @{
- */
-
-/**
- * @name Register Macros
- *
- * @{
- */
-
- #define OR1K_REG(x)           (*((volatile unsigned char *) (x)))
- #define OR1K_BIT(n)           (1 << (n))
-
-/** @} */
-
-/**
- * @name Internal OR1K UART Registers
- *
- * @{
- */
-#define OR1K_BSP_CLOCK_FREQ       50000000UL
-#define OR1K_BSP_UART_BASE        0x90000000
-
-#define OR1K_BSP_UART_REG_TX              (OR1K_BSP_UART_BASE+0)
-#define OR1K_BSP_UART_REG_RX              (OR1K_BSP_UART_BASE+0)
-#define OR1K_BSP_UART_REG_DEV_LATCH_LOW   (OR1K_BSP_UART_BASE+0)
-#define OR1K_BSP_UART_REG_DEV_LATCH_HIGH  (OR1K_BSP_UART_BASE+1)
-#define OR1K_BSP_UART_REG_INT_ENABLE      (OR1K_BSP_UART_BASE+1)
-#define OR1K_BSP_UART_REG_INT_ID          (OR1K_BSP_UART_BASE+2)
-#define OR1K_BSP_UART_REG_FIFO_CTRL       (OR1K_BSP_UART_BASE+2)
-#define OR1K_BSP_UART_REG_LINE_CTRL       (OR1K_BSP_UART_BASE+3)
-#define OR1K_BSP_UART_REG_MODEM_CTRL      (OR1K_BSP_UART_BASE+4)
-#define OR1K_BSP_UART_REG_LINE_STATUS     (OR1K_BSP_UART_BASE+5)
-#define OR1K_BSP_UART_REG_MODEM_STATUS    (OR1K_BSP_UART_BASE+6)
-#define OR1K_BSP_UART_REG_SCRATCH         (OR1K_BSP_UART_BASE+7)
-
-/* FIFO Control Register */
-#define OR1K_BSP_UART_REG_FIFO_CTRL_TRIGGER_1    (0x00)
-#define OR1K_BSP_UART_REG_FIFO_CTRL_ENABLE_FIFO  (0x01)
-#define OR1K_BSP_UART_REG_FIFO_CTRL_CLEAR_RCVR   (0x02)
-#define OR1K_BSP_UART_REG_FIFO_CTRL_CLEAR_XMIT   (0x03)
-#define OR1K_BSP_UART_REG_FIFO_CTRL_DMA_SELECT   (0x08)
-#define OR1K_BSP_UART_REG_FIFO_CTRL_TRIGGER_4    (0x40)
-#define OR1K_BSP_UART_REG_FIFO_CTRL_TRIGGER_8    (0x80)
-#define OR1K_BSP_UART_REG_FIFO_CTRL_TRIGGER_14   (0xC0)
-#define OR1K_BSP_UART_REG_FIFO_CTRL_TRIGGER_MASK (0xC0)
-
-/* Line Control Register */
-#define OR1K_BSP_UART_REG_LINE_CTRL_WLEN5  (0x00)
-#define OR1K_BSP_UART_REG_LINE_CTRL_WLEN6  (0x01)
-#define OR1K_BSP_UART_REG_LINE_CTRL_WLEN7  (0x02)
-#define OR1K_BSP_UART_REG_LINE_CTRL_WLEN8  (0x03)
-#define OR1K_BSP_UART_REG_LINE_CTRL_STOP   (0x04)
-#define OR1K_BSP_UART_REG_LINE_CTRL_PARITY (0x08)
-#define OR1K_BSP_UART_REG_LINE_CTRL_EPAR   (0x10)
-#define OR1K_BSP_UART_REG_LINE_CTRL_SPAR   (0x20)
-#define OR1K_BSP_UART_REG_LINE_CTRL_SBC    (0x40)
-#define OR1K_BSP_UART_REG_LINE_CTRL_DLAB   (0x80)
-
-/* Line Status Register */
-#define OR1K_BSP_UART_REG_LINE_STATUS_DR   (0x01)
-#define OR1K_BSP_UART_REG_LINE_STATUS_OE   (0x02)
-#define OR1K_BSP_UART_REG_LINE_STATUS_PE   (0x04)
-#define OR1K_BSP_UART_REG_LINE_STATUS_FE   (0x08)
-#define OR1K_BSP_UART_REG_LINE_STATUS_BI   (0x10)
-#define OR1K_BSP_UART_REG_LINE_STATUS_THRE (0x20)
-#define OR1K_BSP_UART_REG_LINE_STATUS_TEMT (0x40)
-
-/* Modem Control Register */
-#define OR1K_BSP_UART_REG_MODEM_CTRL_DTR  (0x01)
-#define OR1K_BSP_UART_REG_MODEM_CTRL_RTS  (0x02)
-#define OR1K_BSP_UART_REG_MODEM_CTRL_OUT1 (0x04)
-#define OR1K_BSP_UART_REG_MODEM_CTRL_OUT2 (0x08)
-#define OR1K_BSP_UART_REG_MODEM_CTRL_LOOP (0x10)
-
-/* Modem Status Register */
-#define OR1K_BSP_UART_REG_MODEM_STATUS_DCTS (0x01)
-#define OR1K_BSP_UART_REG_MODEM_STATUS_DDSR (0x02)
-#define OR1K_BSP_UART_REG_MODEM_STATUS_TERI (0x04)
-#define OR1K_BSP_UART_REG_MODEM_STATUS_DDCD (0x08)
-#define OR1K_BSP_UART_REG_MODEM_STATUS_CTS  (0x10)
-#define OR1K_BSP_UART_REG_MODEM_STATUS_DSR  (0x20)
-#define OR1K_BSP_UART_REG_MODEM_STATUS_RI   (0x40)
-#define OR1K_BSP_UART_REG_MODEM_STATUS_DCD  (0x80)
-#define OR1K_BSP_UART_REG_MODEM_STATUS_ANY_DELTA (0x0F)
-
-/** @} */
-
-/** @} */
-
-#endif /* LIBBSP_GENERIC_OR1K_H */
diff --git a/c/src/lib/libbsp/or1k/generic_or1k/include/irq.h b/c/src/lib/libbsp/or1k/generic_or1k/include/irq.h
deleted file mode 100644
index 791aefcae0..0000000000
--- a/c/src/lib/libbsp/or1k/generic_or1k/include/irq.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * @file
- *
- * @ingroup OR1K_IRQ
- *
- * @brief Interrupt definitions.
- */
-
-/**
- * COPYRIGHT (c) 2014-2015 Hesham ALMatary <heshamelmatary@gmail.com>
- *
- * 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_GENERIC_OR1K_IRQ_H
-#define LIBBSP_GENERIC_OR1K_IRQ_H
-
-#ifndef ASM
-
-#include <rtems.h>
-#include <rtems/irq.h>
-#include <rtems/irq-extension.h>
-
-#define BSP_INTERRUPT_VECTOR_MIN  0x100
-#define BSP_INTERRUPT_VECTOR_MAX  0x1F00
-
-/* Interrupt Identification Register */
-#define OR1K_BSP_UART_REG_INT_ID_MSI    (0x00)
-#define OR1K_BSP_UART_REG_INT_ID_NO_INT (0x01)
-#define OR1K_BSP_UART_REG_INT_ID_THRI   (0x02)
-#define OR1K_BSP_UART_REG_INT_ID_RDI    (0x04)
-#define OR1K_BSP_UART_REG_INT_ID_ID     (0x06)
-#define OR1K_BSP_UART_REG_INT_ID_RLSI   (0x06)
-#define OR1K_BSP_UART_REG_INT_ID_TOI    (0x0c)
-
-/* Interrupt Enable Register */
-#define OR1K_BSP_UART_REG_INT_ENABLE_RDI  (0x01)
-#define OR1K_BSP_UART_REG_INT_ENABLE_THRI (0x02)
-#define OR1K_BSP_UART_REG_INT_ENABLE_RLSI (0x04)
-#define OR1K_BSP_UART_REG_INT_ENABLE_MSI  (0x08)
-
-#endif /* ASM */
-#endif /* LIBBSP_GENERIC_OR1K_IRQ_H */
diff --git a/c/src/lib/libbsp/or1k/generic_or1k/include/tm27.h b/c/src/lib/libbsp/or1k/generic_or1k/include/tm27.h
deleted file mode 100644
index 0dfa7bf628..0000000000
--- a/c/src/lib/libbsp/or1k/generic_or1k/include/tm27.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <rtems/tm27-default.h>
diff --git a/c/src/lib/libbsp/or1k/generic_or1k/include/uart.h b/c/src/lib/libbsp/or1k/generic_or1k/include/uart.h
deleted file mode 100644
index dbf3bbf9ef..0000000000
--- a/c/src/lib/libbsp/or1k/generic_or1k/include/uart.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * @file
- *
- * @ingroup generic_or1k_uart
- *
- * @brief UART support.
- */
-
-/*
- * COPYRIGHT (c) 2014-2015 Hesham ALMatary <heshamelmatary@gmail.com>
- *
- * 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
- */
-
-/**
- * @defgroup generic_or1k_uart UART Support
- *
- * @ingroup generic_or1k
- *
- * @brief Universal Asynchronous Receiver/Transmitter (UART) Support
- */
-
-#ifndef LIBBSP_GENERIC_OR1K_UART_H
-#define LIBBSP_GENERIC_OR1K_UART_H
-
-#include <libchip/serial.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define OR1K_UART_DEFAULT_BAUD  115200
-#define OR1K_BSP_UART_IRQ       2
-extern const console_fns generic_or1k_uart_fns;
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* LIBBSP_GENERIC_OR1K_UART_H */
diff --git a/c/src/lib/libbsp/or1k/generic_or1k/preinstall.am b/c/src/lib/libbsp/or1k/generic_or1k/preinstall.am
deleted file mode 100644
index c11fdb9fbf..0000000000
--- a/c/src/lib/libbsp/or1k/generic_or1k/preinstall.am
+++ /dev/null
@@ -1,116 +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_INCLUDE)/libcpu/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/libcpu
-	@: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(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)/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/linker-symbols.h: ../shared/include/linker-symbols.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/linker-symbols.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/linker-symbols.h
-
-$(PROJECT_INCLUDE)/bsp/mm.h: ../../../libbsp/shared/include/mm.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/mm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/mm.h
-
-$(PROJECT_INCLUDE)/bsp/utility.h: ../../shared/include/utility.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/utility.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/utility.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/stackalloc.h: ../../shared/include/stackalloc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stackalloc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stackalloc.h
-
-$(PROJECT_INCLUDE)/bsp/uart-output-char.h: ../../shared/include/uart-output-char.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/uart-output-char.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/uart-output-char.h
-
-$(PROJECT_INCLUDE)/bsp/cache_.h: ../shared/include/cache_.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/cache_.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/cache_.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)/bsp/uart.h: include/uart.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/uart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/uart.h
-
-$(PROJECT_INCLUDE)/bsp/generic_or1k.h: include/generic_or1k.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/generic_or1k.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/generic_or1k.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.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
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_LIB)/linkcmds.base: ../shared/startup/linkcmds.base $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.base
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds.base
-
diff --git a/c/src/lib/libbsp/or1k/generic_or1k/bsp_specs b/c/src/lib/libbsp/or1k/generic_or1k/startup/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/or1k/generic_or1k/bsp_specs
+++ b/c/src/lib/libbsp/or1k/generic_or1k/startup/bsp_specs