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, 2 insertions, 484 deletions

diff --git a/c/src/lib/libbsp/powerpc/haleakala/Makefile.am b/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
index 32c87428cf..b617fd5f11 100644
--- a/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/haleakala/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/powerpc/haleakala/start/bsp_specs
 
 
 
@@ -19,7 +19,7 @@ librtemsbsp_a_SOURCES =
 # startup
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-loop.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/haleakala/start/bspstart.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
diff --git a/c/src/lib/libbsp/powerpc/haleakala/startup/bsp_specs b/c/src/lib/libbsp/powerpc/haleakala/startup/bsp_specs
deleted file mode 100644
index 5752caaca0..0000000000
--- a/c/src/lib/libbsp/powerpc/haleakala/startup/bsp_specs
+++ /dev/null
@@ -1,10 +0,0 @@
-%rename endfile old_endfile
-%rename startfile old_startfile
-
-*startfile:
-%{!qrtems: %(old_startfile)} \
-%{!nostdlib: %{qrtems: ecrti%O%s rtems_crti%O%s crtbegin.o%s}}
-
-*endfile:
-%{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s ecrtn.o%s}
-
diff --git a/c/src/lib/libbsp/powerpc/haleakala/startup/bspstart.c b/c/src/lib/libbsp/powerpc/haleakala/startup/bspstart.c
deleted file mode 100644
index 18b45f33df..0000000000
--- a/c/src/lib/libbsp/powerpc/haleakala/startup/bspstart.c
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- *  This routine does the bulk of the system initialization.
- */
-
-/*
- *  Author:     Thomas Doerfler <td@imd.m.isar.de>
- *              IMD Ingenieurbuero fuer Microcomputertechnik
- *
- *  COPYRIGHT (c) 1998 by IMD
- *
- *  Changes from IMD are covered by the original distributions terms.
- *  This file has been derived from the papyrus BSP:
- *
- *  Author:     Andrew Bray <andy@i-cubed.co.uk>
- *
- *  COPYRIGHT (c) 1995 by i-cubed ltd.
- *
- *  To anyone who acknowledges that this file is provided "AS IS"
- *  without any express or implied warranty:
- *      permission to use, copy, modify, and distribute this file
- *      for any purpose is hereby granted without fee, provided that
- *      the above copyright notice and this notice appears in all
- *      copies, and that the name of i-cubed limited not be used in
- *      advertising or publicity pertaining to distribution of the
- *      software without specific, written prior permission.
- *      i-cubed limited makes no representations about the suitability
- *      of this software for any purpose.
- *
- *  Modifications for spooling console driver and control of memory layout
- *  with linker command file by
- *              Thomas Doerfler <td@imd.m.isar.de>
- *  for these modifications:
- *  COPYRIGHT (c) 1997 by IMD, Puchheim, Germany.
- *
- *  To anyone who acknowledges that this file is provided "AS IS"
- *  without any express or implied warranty:
- *      permission to use, copy, modify, and distribute this file
- *      for any purpose is hereby granted without fee, provided that
- *      the above copyright notice and this notice appears in all
- *      copies. IMD makes no representations about the suitability
- *      of this software for any purpose.
- *
- *  Derived from c/src/lib/libbsp/no_cpu/no_bsp/startup/bspstart.c:
- *
- *  COPYRIGHT (c) 1989, 1990, 1991, 1992, 1993, 1994.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  Modifications for PPC405GP by Dennis Ehlin
- *
- *  Further modified for the PPC405EX Haleakala board by
- *  Michael Hamel ADInstruments Ltd May 2008
- */
-#include <string.h>
-#include <fcntl.h>
-
-#include <rtems/bspIo.h>
-#include <rtems/counter.h>
-
-#include <bsp.h>
-#include <bsp/bootcard.h>
-#include <bsp/uart.h>
-#include <bsp/irq.h>
-#include <libcpu/powerpc-utility.h>
-#include <bsp/vectors.h>
-#include <ppc4xx/ppc405gp.h>
-#include <ppc4xx/ppc405ex.h>
-
-#include <stdio.h>
-
-LINKER_SYMBOL(intrStack_start);
-LINKER_SYMBOL(intrStack_size);
-/*
- *  Driver configuration parameters
- */
-
-/* Expected by clock.c */
-uint32_t    bsp_clicks_per_usec;
-
-/*-------------------- Haleakala-specific UART setup -------------------------*/
-
-static void
-EarlyUARTInit(int baudRate)
-{
-  volatile uint8_t* up = (uint8_t*)(BSP_UART_IOBASE_COM1);
-  int divider = BSP_UART_BAUD_BASE / baudRate;
-  up[LCR] = DLAB;    /* Access DLM/DLL */
-  up[DLL] = divider & 0x0FF;
-  up[DLM] = divider >> 8;
-  up[LCR] = CHR_8_BITS;
-  up[MCR] = DTR | RTS;
-  up[FCR] = FIFO_EN | XMIT_RESET | RCV_RESET;
-  up[THR] = '+';
-}
-
-
-static void
-InitUARTClock(void)
-{
-  uint32_t reg;
-  mfsdr(SDR0_UART0,reg);
-  reg &= ~0x008000FF;
-  reg |= 0x00800001;    /* Ext clock, div 1 */
-  mtsdr(SDR0_UART0,reg);
-}
-
-static void GPIO_AlternateSelect(int bitnum, int source)
-/* PPC405EX: select a GPIO function for the specified pin */
-{
-  int shift;
-  unsigned long value, mask;
-  GPIORegisters* gpioPtr = (GPIORegisters*)(GPIOAddress);
-
-  shift = (31 - bitnum) & 0xF;
-  value = (source & 3) << (shift*2);
-  mask  = 3 << (shift*2);
-  if (bitnum <= 15) {
-    gpioPtr->OSRL = (gpioPtr->OSRL & ~mask) | value;
-    gpioPtr->TSRL = (gpioPtr->TSRL & ~mask) | value;
-  } else {
-    gpioPtr->OSRH = (gpioPtr->OSRH & ~mask) | value;
-    gpioPtr->TSRH = (gpioPtr->TSRH & ~mask) | value;
-  }
-}
-
-static void Init_FPGA(void)
-{
-  /* Have to write to the FPGA to enable the UART drivers */
-  /* Have to enable CS2 as an output in GPIO to get the FPGA working */
-  mtebc(EBC0_B2CR,0xF0018000);  /* Set up CS2 at 0xF0000000 */
-  mtebc(EBC0_B2AP,0x9400C800);
-  GPIO_AlternateSelect(9,1);    /* GPIO9 = PerCS2 */
-  {
-    unsigned long *fpgaPtr = (unsigned long*)(0xF0000000);
-    unsigned long n;
-    n = *(fpgaPtr);
-    n &= ~0x00100;    /* User LEDs on */
-    n |=  0x30000;    /* UART 0 and 1 transcievers on! */
-    *fpgaPtr = n;
-  }
-}
-
-/*===================================================================*/
-
-static void
-DirectUARTWrite(const char c)
-{
-  volatile uint8_t* up = (uint8_t*)(BSP_UART_IOBASE_COM1);
-  while ((up[LSR] & THRE) == 0) { ; }
-  up[THR] = c;
-}
-
-/* We will provide our own printk output function as it may get used early */
-BSP_output_char_function_type     BSP_output_char = DirectUARTWrite;
-BSP_polling_getchar_function_type BSP_poll_char = NULL;
-
-/*===================================================================*/
-
-void bsp_start( void )
-{
-  /* Get the UART clock initialized first in case we call printk */
-
-  InitUARTClock();
-  Init_FPGA();
-  EarlyUARTInit(115200);
-
-  /*
-   * Get CPU identification dynamically. Note that the get_ppc_cpu_type()
-   * function store the result in global variables
-   * so that it can be used later...
-   */
-  get_ppc_cpu_type();
-  get_ppc_cpu_revision();
-
-  /*
-   *  initialize the device driver parameters
-   */
-
-  /* Set globals visible to clock.c */
-  /* timebase register ticks/microsecond = CPU Clk in MHz */
-  bsp_clicks_per_usec = 400;
-  rtems_counter_initialize_converter(bsp_clicks_per_usec * 1000000);
-
-  /*
-   * Initialize default raw exception handlers.
-   */
-  ppc_exc_initialize(
-    (uintptr_t) intrStack_start,
-    (uintptr_t) intrStack_size
-  );
-
-  /*
-   * Install our own set of exception vectors
-   */
-  BSP_rtems_irq_mng_init(0);
-}
diff --git a/c/src/lib/libbsp/powerpc/haleakala/startup/linkcmds b/c/src/lib/libbsp/powerpc/haleakala/startup/linkcmds
deleted file mode 100644
index 8c06a5103b..0000000000
--- a/c/src/lib/libbsp/powerpc/haleakala/startup/linkcmds
+++ /dev/null
@@ -1,277 +0,0 @@
-/* 
- *  This file contains directives for the GNU linker which are specific
- *  to the 405GP/EX
- *  This file is intended to be used together with dlentry.s
- *  it will generate downloadable code
- *
- *  Modifications for gen405 by Dennis Ehlin
- *  Modifications for virtex by Keith, Greg, and Bob
- *  Modifications for 405GP/EX by Michael Hamel
- */
-
-OUTPUT_FORMAT("elf32-powerpc", "elf32-powerpc", "elf32-powerpc")
-OUTPUT_ARCH(powerpc)
-ENTRY(download_entry)
-EXTERN(__vectors)
-
-kIntrStackSize = 16K;
-kMainStackSize = 64K;
-
-RamBase = DEFINED(RamBase) ? RamBase : 0;
-RamSize = DEFINED(RamSize) ? RamSize : 256M;
-HeapSize = DEFINED(HeapSize) ? HeapSize : 0x0;
-
-MEMORY {
-        RAM : ORIGIN = 0, LENGTH = 256M
-        /*FLASH : ORIGIN = 0xFFE00000, LENGTH = 16M*/
-}
-
-
-SECTIONS
-{
-  /* First 16K is occupied by exception vectors and anything else we want to put there */
-  .text 0x4000:
-  {
-     text.start = . ;
-     *(.entry)
-     *(.entry2)
-     *(.text*)
-     *(.rodata*)
-     *(.rodata1)
-     KEEP (*(SORT(.rtemsroset.*)))
-
-     /*
-      * Special FreeBSD sysctl sections.
-      */
-     . = ALIGN (16);
-     __start_set_sysctl_set = .;
-     *(set_sysctl_*);
-     __stop_set_sysctl_set = ABSOLUTE(.);
-     *(set_domain_*);
-     *(set_pseudo_*);
-
-    /* C++ constructors/destructors */
-    *(.gnu.linkonce.t*)
-
-    /*  Initialization and finalization code.
-     *
-     *  Various files can provide initialization and finalization functions.
-     *  The bodies of these functions are in .init and .fini sections. We
-     *  accumulate the bodies here, and prepend function prologues from
-     *  ecrti.o and function epilogues from ecrtn.o. ecrti.o must be linked
-     *  first; ecrtn.o must be linked last. Because these are wildcards, it
-     *  doesn't matter if the user does not actually link against ecrti.o and
-     *  ecrtn.o; the linker won't look for a file to match a wildcard.  The
-     *  wildcard also means that it doesn't matter which directory ecrti.o
-     *  and ecrtn.o are in. 
-     */
-    PROVIDE (_init = .);
-    *ecrti.o(.init)
-    *(.init)
-    *ecrtn.o(.init)
-    
-    PROVIDE (_fini = .);
-    *ecrti.o(.fini)
-    *(.fini)
-    *ecrtn.o(.init)
-
-    /* 
-     *  C++ constructors and destructors for static objects.
-     *  PowerPC EABI does not use crtstuff yet, so we build "old-style"
-     *  constructor and destructor lists that begin with the list length
-     *  end terminate with a NULL entry.
-     */
-     
-    PROVIDE (__CTOR_LIST__ = .);	     
-    *crtbegin.o(.ctors)
-    *(.ctors)
-    *crtend.o(.ctors)
-    LONG(0)
-    PROVIDE (__CTOR_END__ = .);
-	
-    PROVIDE (__DTOR_LIST__ = .);
-    *crtbegin.o(.dtors)
-    *(.dtors)
-    *crtend.o(.dtors)
-    LONG(0)
-    PROVIDE (__DTOR_END__ = .);
-	
-    /* Exception frame info */
-     *(.eh_frame)
-    /* Miscellaneous read-only data */
-    _rodata_start = . ;
-    *(.gnu.linkonce.r*)
-    *(.lit)
-    *(.shdata)
-    *(.rodata)
-    *(.rodata1)
-    *(.descriptors)
-    *(rom_ver)
-    _erodata = .;
-
-    PROVIDE (__EXCEPT_START__ = .);
-    *(.gcc_except_table*)
-    PROVIDE (__EXCEPT_END__ = .);
-    __GOT_START__ = .;
-    s.got = .;
-    *(.got.plt) 
-    *(.got)
-    *(.got1)
-    PROVIDE (__GOT2_START__ = .);
-    PROVIDE (_GOT2_START_ = .);
-    *(.got2)
-    PROVIDE (__GOT2_END__ = .);
-    PROVIDE (_GOT2_END_ = .);
-    
-    PROVIDE (__FIXUP_START__ = .);
-    PROVIDE (_FIXUP_START_ = .);
-    *(.fixup)
-    PROVIDE (_FIXUP_END_ = .);
-    PROVIDE (__FIXUP_END__ = .);
-    
-
-    /* Various possible names for the end of the .text section */
-     etext = ALIGN(0x10);
-     _etext = .;
-
-     *(.lit)
-     *(.shdata)
-     _endtext = ALIGN(0x10);
-     text.end = .;
-     text.size = text.end - text.start;
-  } >RAM
-
-  text.size = text.end - text.start;
-
-  .tdata : {
-    _TLS_Data_begin = .;
-    *(.tdata .tdata.* .gnu.linkonce.td.*)
-    _TLS_Data_end = .;
-  } >RAM
-
-  .tbss : {
-    _TLS_BSS_begin = .;
-    *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon)
-    _TLS_BSS_end = .;
-  } >RAM
-
-  _TLS_Data_size = _TLS_Data_end - _TLS_Data_begin;
-  _TLS_Data_begin = _TLS_Data_size != 0 ? _TLS_Data_begin : _TLS_BSS_begin;
-  _TLS_Data_end = _TLS_Data_size != 0 ? _TLS_Data_end : _TLS_BSS_begin;
-  _TLS_BSS_size = _TLS_BSS_end - _TLS_BSS_begin;
-  _TLS_Size = _TLS_BSS_end - _TLS_Data_begin;
-  _TLS_Alignment = MAX (ALIGNOF (.tdata), ALIGNOF (.tbss));
-
-  .jcr : { KEEP (*(.jcr)) } >RAM
-
-    .rel.dyn : {
-      *(.rel.init)
-      *(.rel.text .rel.text.* .rel.gnu.linkonce.t.*)
-      *(.rel.fini)
-      *(.rel.rodata .rel.rodata.* .rel.gnu.linkonce.r.*)
-      *(.rel.data.rel.ro* .rel.gnu.linkonce.d.rel.ro.*)
-      *(.rel.data .rel.data.* .rel.gnu.linkonce.d.*)
-      *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*)
-      *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*)
-      *(.rel.ctors)
-      *(.rel.dtors)
-      *(.rel.got)
-      *(.rel.sdata .rel.sdata.* .rel.gnu.linkonce.s.*)
-      *(.rel.sbss .rel.sbss.* .rel.gnu.linkonce.sb.*)
-      *(.rel.sdata2 .rel.sdata2.* .rel.gnu.linkonce.s2.*)
-      *(.rel.sbss2 .rel.sbss2.* .rel.gnu.linkonce.sb2.*)
-      *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*)
-    } >RAM
-    .rela.dyn : {
-      *(.rela.init)
-      *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*)
-      *(.rela.fini)
-      *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*)
-      *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*)
-      *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*)
-      *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*)
-      *(.rela.ctors)
-      *(.rela.dtors)
-      *(.rela.got)
-      *(.rela.got1)
-      *(.rela.got2)
-      *(.rela.sdata .rela.sdata.* .rela.gnu.linkonce.s.*)
-      *(.rela.sbss .rela.sbss.* .rela.gnu.linkonce.sb.*)
-      *(.rela.sdata2 .rela.sdata2.* .rela.gnu.linkonce.s2.*)
-      *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*)
-      *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*)
-    } >RAM
-
-
-    /* Initialised large data */
-    .data ( . ) :
-    {
-      . = ALIGN (4);
-      data.start = .;
-      *(.data)
-      *(.data1)
-      KEEP (*(SORT(.rtemsrwset.*)))
-      *(.data.* .gnu.linkonce.d.*)
-      data.end = .;
-    } > RAM
-
-	/* Initialised small data addressed as offsets from r13 */
-	.sdata : {
-      . = ALIGN (4);
-	  PROVIDE (__SDATA_START__ = .);
-      sdata.start = .;
-	  *(.sdata*)
-      *(.gnu.linkonce.s.*)
-	  sdata.end = .;
-	} > RAM
-
-	/* Zeroed small data addressed as offsets from r13 */
-   .sbss : {
-      . = ALIGN (4);
-	  PROVIDE(__SBSS_START__ = .);
-	  sbss.start = .;
-      *(.sbss .sbss.* *.gnu.linkonce.sb.*);
-	  sbss.end = .;
-    } > RAM
-    PROVIDE(__SBSS_END__ = .);
-
-	/* Zeroed large data */
-	.bss : {
-      . = ALIGN (4);
-	  bss.start = .;
-      *(.bss .bss* .gnu.linkonce.b*)
-      . = ALIGN(4);
-      bss.end = .;
-    } > RAM
-
-    bss.size = bss.end - bss.start;
-    sbss.size = sbss.end - sbss.start;
-	          	
-    /* Interrupt stack: align to a cache-line boundary */
-    IntrStack_start = ALIGN(0x20);
-    . += kIntrStackSize;
-    intrStack = .;
-    PROVIDE(intrStackPtr = intrStack);
-    PROVIDE(intrStack_start = IntrStack_start);
-    PROVIDE(intrStack_size = kIntrStackSize);
-
- 	/* Main stack: align to a cache-line boundary */
-	stack.start = ALIGN(0x20);
-	. += kMainStackSize;
-	stack.end   = .;
-
-	/* RTEMS workspace: size specified by application */
-	WorkAreaBase = ALIGN(0x20);
-
-	/* Debugging information */
-    .line 0 : { *(.line) }
-    .debug 0 : { *(.debug) }
-    .debug_sfnames 0 : { *(.debug_sfnames) }
-    .debug_srcinfo 0 : { *(.debug_srcinfo) }
-    .debug_pubnames 0 : { *(.debug_pubnames) }
-    .debug_aranges 0 : { *(.debug_aranges) }
-    .debug_aregion 0 : { *(.debug_aregion) }
-    .debug_macinfo 0 : { *(.debug_macinfo) }
-    .stab 0 : { *(.stab) }
-    .stabstr 0 : { *(.stabstr) }
-}