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.

5 files changed, 3 insertions, 157 deletions

diff --git a/c/src/lib/libbsp/arm/rtl22xx/Makefile.am b/c/src/lib/libbsp/arm/rtl22xx/Makefile.am
index d4ac6664e9..aff940c6ab 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/Makefile.am
+++ b/c/src/lib/libbsp/arm/rtl22xx/Makefile.am
@@ -3,7 +3,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/arm/rtl22xx/start/bsp_specs
 
 
 noinst_PROGRAMS =
@@ -20,9 +20,9 @@ librtemsbsp_a_SOURCES =
 
 # startup
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/rtl22xx/start/bspstart.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
-librtemsbsp_a_SOURCES += startup/bspreset.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/rtl22xx/start/bspreset.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounterread.c
diff --git a/c/src/lib/libbsp/arm/rtl22xx/startup/bsp_specs b/c/src/lib/libbsp/arm/rtl22xx/startup/bsp_specs
deleted file mode 100644
index 47dd31d46b..0000000000
--- a/c/src/lib/libbsp/arm/rtl22xx/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_endfiles)} %{qrtems: crtend.o%s crtn.o%s}
diff --git a/c/src/lib/libbsp/arm/rtl22xx/startup/bspreset.c b/c/src/lib/libbsp/arm/rtl22xx/startup/bspreset.c
deleted file mode 100644
index 573b4a2aa8..0000000000
--- a/c/src/lib/libbsp/arm/rtl22xx/startup/bspreset.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *  Copyright (c) 2007 by Ray Xu <rayx.cn@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.
- */
-
-#include <bsp.h>
-#include <bsp/bootcard.h>
-#include <lpc22xx.h>
-
-void bsp_reset(void)
-{
-#if ON_SKYEYE == 1
-  #define SKYEYE_MAGIC_ADDRESS (*(volatile unsigned int *)(0xb0000000))
-
-  SKYEYE_MAGIC_ADDRESS = 0xff;
-#else
-  rtems_interrupt_level level;
-
-  (void) level;
-  rtems_interrupt_disable(level);
-
-  #ifdef __thumb__
-    int tmp;
-    __asm__ volatile (" .code 16            \n" \
-                  "ldr %[tmp], =_start  \n" \
-                  "bx  %[tmp]           \n" \
-                  "nop                  \n" \
-                  : [tmp]"=&r" (tmp) );
-  #else
-    __asm__ volatile ("b _start");
-  #endif
-  while(1);
-#endif
-}
diff --git a/c/src/lib/libbsp/arm/rtl22xx/startup/bspstart.c b/c/src/lib/libbsp/arm/rtl22xx/startup/bspstart.c
deleted file mode 100644
index fa128d9054..0000000000
--- a/c/src/lib/libbsp/arm/rtl22xx/startup/bspstart.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- *  LPC22XX/LPC21xx Startup code
- */
-
-/*
- *  Copyright (c) 2007 by Ray Xu <rayx.cn@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.
- */
-
-#include <bsp.h>
-#include <bsp/irq-generic.h>
-#include <lpc22xx.h>
-
-/*
- * bsp_start_default - BSP initialization function
- *
- * This function is called before RTEMS is initialized and used
- * adjust the kernel's configuration.
- *
- * This function also configures the CPU's memory protection unit.
- *
- * RESTRICTIONS/LIMITATIONS:
- *   Since RTEMS is not configured, no RTEMS functions can be called.
- */
-static void bsp_start_default( void )
-{
-  PINSEL2 =0x0f814914;
-  BCFG0 = 0x1000ffef;
-  BCFG1 = 0x1000ffef;
-
-  MEMMAP = 0x2;  //debug and excute outside chip
-
-  PLLCON = 1;
-  #if (Fpclk / (Fcclk / 4)) == 1
-    VPBDIV = 0;
-  #endif
-  #if (Fpclk / (Fcclk / 4)) == 2
-    VPBDIV = 2;
-  #endif
-  #if (Fpclk / (Fcclk / 4)) == 4
-    VPBDIV = 1;
-  #endif
-
-  #if (Fcco / Fcclk) == 2
-    PLLCFG = ((Fcclk / Fosc) - 1) | (0 << 5);
-  #endif
-  #if (Fcco / Fcclk) == 4
-    PLLCFG = ((Fcclk / Fosc) - 1) | (1 << 5);
-  #endif
-  #if (Fcco / Fcclk) == 8
-    PLLCFG = ((Fcclk / Fosc) - 1) | (2 << 5);
-  #endif
-  #if (Fcco / Fcclk) == 16
-    PLLCFG = ((Fcclk / Fosc) - 1) | (3 << 5);
-  #endif
-  PLLFEED = 0xaa;
-  PLLFEED = 0x55;
-  while((PLLSTAT & (1 << 10)) == 0);
-  PLLCON = 3;
-  PLLFEED = 0xaa;
-  PLLFEED = 0x55;
-
-  /* memory configure */
-  /* it is not needed in my formatter board */
-  //MAMCR = 0;
-  // MAMTIM = 3;
-  //MAMCR = 2;
-
-  UART0_Ini();
-
-  /*
-   * Init rtems interrupt management
-   */
-  bsp_interrupt_initialize();
-} /* bsp_start */
-
-/*
- *  By making this a weak alias for bsp_start_default, a brave soul
- *  can override the actual bsp_start routine used.
- */
-void bsp_start (void) __attribute__ ((weak, alias("bsp_start_default")));
diff --git a/c/src/lib/libbsp/arm/rtl22xx/startup/linkcmds b/c/src/lib/libbsp/arm/rtl22xx/startup/linkcmds
deleted file mode 100644
index d39dcb12bd..0000000000
--- a/c/src/lib/libbsp/arm/rtl22xx/startup/linkcmds
+++ /dev/null
@@ -1,24 +0,0 @@
-MEMORY {
-	SDRAM : ORIGIN = 0x81000000, LENGTH = 512k
-	SRAM : ORIGIN = 0x40000000, LENGTH = 16k
-}
-
-REGION_ALIAS ("REGION_START", SDRAM);
-REGION_ALIAS ("REGION_VECTOR", SRAM);
-REGION_ALIAS ("REGION_TEXT", SDRAM);
-REGION_ALIAS ("REGION_TEXT_LOAD", SDRAM);
-REGION_ALIAS ("REGION_RODATA", SDRAM);
-REGION_ALIAS ("REGION_RODATA_LOAD", SDRAM);
-REGION_ALIAS ("REGION_DATA", SDRAM);
-REGION_ALIAS ("REGION_DATA_LOAD", SDRAM);
-REGION_ALIAS ("REGION_FAST_TEXT", SDRAM);
-REGION_ALIAS ("REGION_FAST_TEXT_LOAD", SDRAM);
-REGION_ALIAS ("REGION_FAST_DATA", SDRAM);
-REGION_ALIAS ("REGION_FAST_DATA_LOAD", SDRAM);
-REGION_ALIAS ("REGION_BSS", SDRAM);
-REGION_ALIAS ("REGION_WORK", SDRAM);
-REGION_ALIAS ("REGION_STACK", SDRAM);
-REGION_ALIAS ("REGION_NOCACHE", SDRAM);
-REGION_ALIAS ("REGION_NOCACHE_LOAD", SDRAM);
-
-INCLUDE linkcmds.armv4