bsps: Move startup files to bsps

Adjust build support files to new directory layout.

This patch is a part of the BSP source reorganization.

Update #3285.

4 files changed, 3 insertions, 77 deletions

diff --git a/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am b/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am
index fecd2e8c19..6a0fe40683 100644
--- a/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am
+++ b/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am
@@ -9,7 +9,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/or1k/generic_or1k/start/bsp_specs
 
 ###############################################################################
 #                  Header                                                     #
@@ -24,7 +24,7 @@ start.$(OBJEXT): ../../../../../../bsps/or1k/generic_or1k/start/start.S
 project_lib_DATA = start.$(OBJEXT)
 
 project_lib_DATA += linkcmds
-dist_project_lib_DATA += ../shared/startup/linkcmds.base
+dist_project_lib_DATA += ../../../../../../bsps/or1k/shared/start/linkcmds.base
 
 ###############################################################################
 #                  LibBSP                                                     #
@@ -38,7 +38,7 @@ librtemsbsp_a_LIBADD =
 
 # Startup
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/or1k/generic_or1k/start/bspstart.c
 
 # Shared
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
diff --git a/c/src/lib/libbsp/or1k/generic_or1k/startup/bsp_specs b/c/src/lib/libbsp/or1k/generic_or1k/startup/bsp_specs
deleted file mode 100644
index 87638cc027..0000000000
--- a/c/src/lib/libbsp/or1k/generic_or1k/startup/bsp_specs
+++ /dev/null
@@ -1,9 +0,0 @@
-%rename endfile old_endfile
-%rename startfile old_startfile
-
-*startfile:
-%{!qrtems: %(old_startfile)} \
-%{!nostdlib: %{qrtems: crti.o%s crtbegin.o%s}}
-
-*endfile:
-%{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s crtn.o%s}
diff --git a/c/src/lib/libbsp/or1k/generic_or1k/startup/bspstart.c b/c/src/lib/libbsp/or1k/generic_or1k/startup/bspstart.c
deleted file mode 100644
index 35a536ef0b..0000000000
--- a/c/src/lib/libbsp/or1k/generic_or1k/startup/bspstart.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file
- *
- * @ingroup generic_or1k
- *
- * @brief Benchmark timer support.
- */
-
-/*
- * Copyright (c) 2014-2015 by Hesham ALMatary
- *
- *  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
- */
-
-#include <bsp.h>
-#include <bsp/bootcard.h>
-
-void bsp_start( void )
-{
-  rtems_cache_enable_instruction();
-  rtems_cache_enable_data();
-}
diff --git a/c/src/lib/libbsp/or1k/generic_or1k/startup/linkcmds b/c/src/lib/libbsp/or1k/generic_or1k/startup/linkcmds
deleted file mode 100644
index cef99d36d0..0000000000
--- a/c/src/lib/libbsp/or1k/generic_or1k/startup/linkcmds
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * @file
- *
- * @ingroup bsp_linker
- *
- * @brief Memory map
- */
-
-/*
- * COPYRIGHT (c) 2014 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
- */
-
-MEMORY
-  {
-      VECTOR_RAM     (AIW) : ORIGIN = 0x0       , LENGTH = 8260
-      RAM   : org = 0x00002048, l = 0x1FFDFB8
-      UNEXPECTED_SECTIONS : ORIGIN = 0xffffffff, LENGTH = 0
-  }
-
-REGION_ALIAS ("REGION_START", RAM);
-REGION_ALIAS ("REGION_VECTOR", VECTOR_RAM);
-REGION_ALIAS ("REGION_TEXT", RAM);
-REGION_ALIAS ("REGION_TEXT_LOAD", RAM);
-REGION_ALIAS ("REGION_RODATA", RAM);
-REGION_ALIAS ("REGION_RODATA_LOAD", RAM);
-REGION_ALIAS ("REGION_DATA", RAM);
-REGION_ALIAS ("REGION_DATA_LOAD", RAM);
-REGION_ALIAS ("REGION_FAST_DATA", RAM);
-REGION_ALIAS ("REGION_FAST_DATA_LOAD", RAM);
-REGION_ALIAS ("REGION_BSS", RAM);
-REGION_ALIAS ("REGION_WORK", RAM);
-REGION_ALIAS ("REGION_STACK", RAM);
-
-bsp_section_vector_begin = 0;
-bsp_section_stack_begin = 0x1FFDFB8;
-
-INCLUDE linkcmds.base