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.

8 files changed, 11 insertions, 531 deletions

diff --git a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
index 6bc09151ff..8af0c2bbb1 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mvme5500/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/mvme5500/start/bsp_specs
 
 
 noinst_PROGRAMS =
@@ -14,16 +14,16 @@ librtemsbsp_a_SOURCES =
 # UNUSED
 
 # startup
-librtemsbsp_a_SOURCES += startup/bspstart.c
-librtemsbsp_a_SOURCES += ../shared/startup/pgtbl_setup.c
-librtemsbsp_a_SOURCES += startup/pgtbl_activate.c
-librtemsbsp_a_SOURCES += ../shared/startup/zerobss.c
-librtemsbsp_a_SOURCES += ../shared/startup/bspgetworkarea.c
-librtemsbsp_a_SOURCES += ../shared/startup/sbrk.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mvme5500/start/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/start/pgtbl_setup.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mvme5500/start/pgtbl_activate.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/start/zerobss.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/start/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
-librtemsbsp_a_SOURCES += startup/bspclean.c
-librtemsbsp_a_SOURCES += startup/bspreset.c
-librtemsbsp_a_SOURCES += ../shared/startup/probeMemEnd.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mvme5500/start/bspclean.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mvme5500/start/bspreset.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/start/probeMemEnd.c
 
 # pclock
 librtemsbsp_a_SOURCES +=../../../../../../bsps/powerpc/shared/clock/p_clock.c
@@ -72,7 +72,7 @@ mvme5500start___OBJEXT__LDFLAGS = $(RTEMS_RELLDFLAGS)
 project_lib_DATA += mvme5500start.$(OBJEXT)
 
 project_lib_DATA += linkcmds
-dist_project_lib_DATA += ../shared/startup/linkcmds.share
+dist_project_lib_DATA += ../../../../../../bsps/powerpc/shared/start/linkcmds.share
 
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/altivec/vec_sup.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/altivec/vec_sup_asm.S
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/startup/bootpstuff.c b/c/src/lib/libbsp/powerpc/mvme5500/startup/bootpstuff.c
deleted file mode 100644
index 518a43cdc8..0000000000
--- a/c/src/lib/libbsp/powerpc/mvme5500/startup/bootpstuff.c
+++ /dev/null
@@ -1,70 +0,0 @@
-#define FLAG_MAND	1
-#define FLAG_NOUSE	2	/* dont put into the commandline at all */
-#define FLAG_CLRBP  4	/* field needs to be cleared for bootp  */
-
-typedef struct ParmRec_ {
-	char	*name;
-	char	**pval;
-	int		flags;
-} ParmRec, *Parm;
-
-
-static char *boot_filename=0;
-static char *boot_srvname=0;
-static char *boot_use_bootp=0;
-static char	*boot_my_ip=0;
-static char	*boot_my_netmask=0;
-
-#define boot_cmdline BSP_commandline_string
-
-static ParmRec parmList[]={
-	{ "BP_FILE=",  &boot_filename,
-			FLAG_MAND,
-	},
-	{ "BP_PARM=",  &boot_cmdline,
-			0,
-	},
-	{ "BP_SRVR=",  &boot_srvname,
-			FLAG_MAND,
-	},
-	{ "BP_GTWY=",  &net_config.gateway,
-			FLAG_CLRBP,
-	},
-	{ "BP_MYIP=",  &boot_my_ip,
-			FLAG_MAND | FLAG_CLRBP,
-	},
-	{ "BP_MYMK=",  &boot_my_netmask,
-			FLAG_MAND | FLAG_CLRBP,
-	},
-	{ "BP_MYNM=",  &net_config.hostname,
-			FLAG_CLRBP,
-	},
-	{ "BP_MYDN=",  &net_config.domainname,
-			FLAG_CLRBP,
-	},
-	{ "BP_LOGH=",  &net_config.log_host,
-			FLAG_CLRBP,
-	},
-	{ "BP_DNS1=",  &net_config.name_server[0],
-			FLAG_CLRBP,
-	},
-	{ "BP_DNS2=",  &net_config.name_server[1],
-			FLAG_CLRBP,
-	},
-	{ "BP_DNS3=",  &net_config.name_server[2],
-			FLAG_CLRBP,
-	},
-	{ "BP_NTP1=",  &net_config.ntp_server[0],
-			FLAG_CLRBP,
-	},
-	{ "BP_NTP2=",  &net_config.ntp_server[1],
-			FLAG_CLRBP,
-	},
-	{ "BP_NTP3=",  &net_config.ntp_server[2],
-			FLAG_CLRBP,
-	},
-	{ "BP_ENBL=",  &boot_use_bootp,
-			0,
-	},
-	{ 0, }
-};
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/startup/bsp_specs b/c/src/lib/libbsp/powerpc/mvme5500/startup/bsp_specs
deleted file mode 100644
index 2625609327..0000000000
--- a/c/src/lib/libbsp/powerpc/mvme5500/startup/bsp_specs
+++ /dev/null
@@ -1,9 +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/mvme5500/startup/bspclean.c b/c/src/lib/libbsp/powerpc/mvme5500/startup/bspclean.c
deleted file mode 100644
index bd332cc89c..0000000000
--- a/c/src/lib/libbsp/powerpc/mvme5500/startup/bspclean.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2003, Shuchen Kate Feng <feng1@bnl.gov>,
- *                    NSLS,Brookhaven National Laboratory
- */
-#include <bsp.h>
-#include <bsp/bootcard.h>
-#include <rtems/bspIo.h>
-#include <libcpu/stackTrace.h>
-
-#define AUTO_BOOT 0
-
-void bsp_fatal_extension(
-  rtems_fatal_source source,
-  bool always_set_to_false,
-  rtems_fatal_code error
-)
-{
-#if AUTO_BOOT
-  /* Till Straumann <strauman@slac.stanford.edu> for SVGM */
-  bsp_reset();
-#else
-  /* Kate Feng <feng1@bnl.gov> for the MVME5500 */
-  printk("\nPrinting a stack trace for your convenience :-)\n");
-  CPU_print_stack();
-  printk("RTEMS terminated; Boot manually or turn on AUTO_BOOT.\n");
-#endif
-}
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/startup/bspreset.c b/c/src/lib/libbsp/powerpc/mvme5500/startup/bspreset.c
deleted file mode 100644
index de15bc4972..0000000000
--- a/c/src/lib/libbsp/powerpc/mvme5500/startup/bspreset.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2003, Shuchen Kate Feng <feng1@bnl.gov>,
- *                    NSLS,Brookhaven National Laboratory
- *
- */
-
-#include <bsp.h>
-#include <bsp/bootcard.h>
-#include <rtems/bspIo.h>
-#include <libcpu/io.h>
-#include <libcpu/stackTrace.h>
-#include <stdint.h>
-
-void bsp_reset()
-{
-
-  printk("Printing a stack trace for your convenience :-)\n");
-  CPU_print_stack();
-
-  printk("RTEMS terminated; Rebooting ...\n");
-  /* Mvme5500 board reset : 2004 S. Kate Feng <feng1@bnl.gov>  */
-  out_8((volatile uint8_t*) (GT64x60_DEV1_BASE +2), 0x80);
-}
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/startup/bspstart.c b/c/src/lib/libbsp/powerpc/mvme5500/startup/bspstart.c
deleted file mode 100644
index 279524eb8f..0000000000
--- a/c/src/lib/libbsp/powerpc/mvme5500/startup/bspstart.c
+++ /dev/null
@@ -1,351 +0,0 @@
-/*
- *  This routine does the bulk of the system initialization.
- */
-
-/*
- *  COPYRIGHT (c) 1989-2007.
- *  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.
- *
- *  Modified to support the MCP750.
- *  Modifications Copyright (C) 1999 Eric Valette. valette@crf.canon.fr
- *
- *  Modified to support the Synergy VGM & Motorola PowerPC boards
- *  (C) by Till Straumann, <strauman@slac.stanford.edu>, 2002, 2004, 2005
- *
- *  Modified to support the MVME5500 board.
- *  Also, the settings of L1, L2, and L3 caches is not necessary here.
- *  (C) by Brookhaven National Lab., S. Kate Feng <feng1@bnl.gov>, 2003-2009
- */
-
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
-
-#include <rtems/sysinit.h>
-#include <rtems/system.h>
-#include <rtems/powerpc/powerpc.h>
-
-#include <libcpu/spr.h>   /* registers.h is included here */
-#include <bsp.h>
-#include <bsp/bootcard.h>
-#include <bsp/uart.h>
-#include <bsp/pci.h>
-#include <libcpu/bat.h>
-#include <libcpu/pte121.h>
-#include <libcpu/cpuIdent.h>
-#include <bsp/vectors.h>
-#include <bsp/VME.h>
-#include <bsp/bspException.h>
-
-#include <rtems/bspIo.h>
-#include <rtems/counter.h>
-
-/*
-#define SHOW_MORE_INIT_SETTINGS
-#define SHOW_LCR1_REGISTER
-#define SHOW_LCR2_REGISTER
-#define SHOW_LCR3_REGISTER
-#define CONF_VPD
-*/
-
-extern uint32_t probeMemoryEnd(void); /* from shared/startup/probeMemoryEnd.c */
-
-BSP_output_char_function_type     BSP_output_char = BSP_output_char_via_serial;
-BSP_polling_getchar_function_type BSP_poll_char = NULL;
-
-extern void _return_to_ppcbug(void);
-extern unsigned long __rtems_end[];
-extern unsigned get_L1CR(void), get_L2CR(void), get_L3CR(void);
-extern Triv121PgTbl BSP_pgtbl_setup(unsigned int *);
-extern void BSP_pgtbl_activate(Triv121PgTbl);
-extern int I2Cread_eeprom(unsigned char I2cBusAddr, uint32_t devA2A1A0, uint32_t AddrBytes, unsigned char *pBuff, uint32_t numBytes);
-extern void BSP_vme_config(void);
-
-extern unsigned char ReadConfVPD_buff(int offset);
-
-uint32_t bsp_clicks_per_usec;
-
-typedef struct CmdLineRec_ {
-    unsigned long  size;
-    char           buf[0];
-} CmdLineRec, *CmdLine;
-
-
-#define mtspr(reg, val)  \
-  __asm __volatile("mtspr %0,%1" : : "K"(reg), "r"(val))
-
-
-#define mfspr(reg) \
-  ( { unsigned val; \
-    __asm __volatile("mfspr %0,%1" : "=r"(val) : "K"(reg)); \
-    val; } )
-
-/*
- * Copy Additional boot param passed by boot loader
- */
-#define MAX_LOADER_ADD_PARM 80
-char loaderParam[MAX_LOADER_ADD_PARM];
-
-/*
- * Total memory using RESIDUAL DATA
- */
-unsigned int BSP_mem_size;
-/*
- * PCI Bus Frequency
- */
-unsigned int BSP_bus_frequency;
-/*
- * processor clock frequency
- */
-unsigned int BSP_processor_frequency;
-/*
- * Time base divisior (how many tick for 1 second).
- */
-unsigned int BSP_time_base_divisor;
-static unsigned char ConfVPD_buff[200];
-
-#define CMDLINE_BUF_SIZE  2048
-
-static char cmdline_buf[CMDLINE_BUF_SIZE];
-char *BSP_commandline_string = cmdline_buf;
-
-/* NOTE: we cannot simply malloc the commandline string;
- * save_boot_params() is called during a very early stage when
- * libc/malloc etc. are not yet initialized!
- *
- * Here's what we do:
- *
- * initial layout setup by the loader (preload.S):
- *
- * 0..RTEMS...__rtems_end | cmdline ....... TOP
- *
- * After the save_boot_params() routine returns, the stack area will be
- * set up (start.S):
- *
- * 0..RTEMS..__rtems_end | INIT_STACK | IRQ_STACK | ..... TOP
- *
- * initialize_executive_early() [called from boot_card()]
- * will initialize the workspace:
- *
- * 0..RTEMS..__rtems_end | INIT_STACK | IRQ_STACK | ...... | workspace | TOP
- *
- * and later calls our bsp_predriver_hook() which ends up initializing
- * libc which in turn initializes the heap
- *
- * 0..RTEMS..__rtems_end | INIT_STACK | IRQ_STACK | heap | workspace | TOP
- *
- * The idea here is to first move the commandline to the future 'heap' area
- * from where it will be picked up by our bsp_predriver_hook().
- * bsp_predriver_hook() then moves it either to INIT_STACK or the workspace
- * area using proper allocation, initializes libc and finally moves
- * the data to the environment / malloced areas...
- */
-
-/* this routine is called early at shared/start/start.S
- * and must be safe with a not properly aligned stack
- */
-char *
-save_boot_params(
-  void *r3,
-  void *r4,
-  void* r5,
-  char *cmdline_start,
-  char *cmdline_end
-)
-{
-  int i=cmdline_end-cmdline_start;
-
-  if ( i >= CMDLINE_BUF_SIZE )
-    i = CMDLINE_BUF_SIZE-1;
-  else if ( i < 0 )
-    i = 0;
-
-  memmove(cmdline_buf, cmdline_start, i);
-  cmdline_buf[i]=0;
-  return cmdline_buf;
-}
-
-void bsp_start( void )
-{
-#ifdef CONF_VPD
-  int i;
-#endif
-#ifdef SHOW_LCR1_REGISTER
-  unsigned l1cr;
-#endif
-#ifdef SHOW_LCR2_REGISTER
-  unsigned l2cr;
-#endif
-#ifdef SHOW_LCR3_REGISTER
-  unsigned l3cr;
-#endif
-  uintptr_t intrStackStart;
-  uintptr_t intrStackSize;
-  Triv121PgTbl  pt=0;
-
-  /* Till Straumann: 4/2005
-   * Need to map the system registers early, so we can printk...
-   * (otherwise we silently die)
-   */
-  /*
-   * Kate Feng : PCI 0 domain memory space, want to leave room for the VME window
-   */
-  setdbat(2, PCI0_MEM_BASE, PCI0_MEM_BASE, 0x10000000, IO_PAGE);
-
-  /* Till Straumann: 2004
-   * map the PCI 0, 1 Domain I/O space, GT64260B registers
-   * and the reserved area so that the size is the power of 2.
-   * 2009 : map the entire 256 M space
-   *
-   */
-  setdbat(3,PCI0_IO_BASE, PCI0_IO_BASE, 0x10000000, IO_PAGE);
-
-
-  /*
-   * 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();
-
-#ifdef SHOW_LCR1_REGISTER
-  l1cr = get_L1CR();
-  printk("Initial L1CR value = %x\n", l1cr);
-#endif
-
-  /*
-   * Initialize the interrupt related settings.
-   */
-  intrStackStart = (uintptr_t) __rtems_end;
-  intrStackSize = rtems_configuration_get_interrupt_stack_size();
-
-  /*
-   * Initialize default raw exception handlers.
-   */
-  ppc_exc_initialize(intrStackStart, intrStackSize);
-
-  /*
-   * Init MMU block address translation to enable hardware
-   * access
-   * More PCI1 memory mapping to be done after BSP_pgtbl_activate.
-   */
-  printk("-----------------------------------------\n");
-  printk("Welcome to %s on MVME5500-0163\n", _RTEMS_version );
-  printk("-----------------------------------------\n");
-
-  BSP_mem_size         =  probeMemoryEnd();
-
-  /* TODO: calculate the BSP_bus_frequency using the REF_CLK bit
-   *       of System Status  register
-   */
-  /* rtems_bsp_delay_in_bus_cycles are defined in registers.h */
-  BSP_bus_frequency      = 133333333;
-  BSP_processor_frequency    = 1000000000;
-  /* P94 : 7455 clocks the TB/DECR at 1/4 of the system bus clock frequency */
-  BSP_time_base_divisor      = 4000;
-
-  /* Maybe not setup yet becuase of the warning message */
-  /* Allocate and set up the page table mappings
-   * This is only available on >604 CPUs.
-   *
-   * NOTE: This setup routine may modify the available memory
-   *       size. It is essential to call it before
-   *       calculating the workspace etc.
-   */
-  pt = BSP_pgtbl_setup(&BSP_mem_size);
-  if (!pt)
-     printk("WARNING: unable to setup page tables.\n");
-
-  printk("Now BSP_mem_size = 0x%x\n",BSP_mem_size);
-
-  /* P94 : 7455 TB/DECR is clocked by the system bus clock frequency */
-
-  bsp_clicks_per_usec    = BSP_bus_frequency/(BSP_time_base_divisor * 1000);
-  rtems_counter_initialize_converter(
-    BSP_bus_frequency / (BSP_time_base_divisor / 1000)
-  );
-
-  /*
-   * Initalize RTEMS IRQ system
-   */
-   BSP_rtems_irq_mng_init(0);
-
-#ifdef SHOW_LCR2_REGISTER
-  l2cr = get_L2CR();
-  printk("Initial L2CR value = %x\n", l2cr);
-#endif
-
-#ifdef SHOW_LCR3_REGISTER
-  /* L3CR needs DEC int. handler installed for bsp_delay()*/
-  l3cr = get_L3CR();
-  printk("Initial L3CR value = %x\n", l3cr);
-#endif
-
-
-  /* Activate the page table mappings only after
-   * initializing interrupts because the irq_mng_init()
-   * routine needs to modify the text
-   */
-  if (pt) {
-#ifdef SHOW_MORE_INIT_SETTINGS
-    printk("Page table setup finished; will activate it NOW...\n");
-#endif
-    BSP_pgtbl_activate(pt);
-  }
-  /* Read Configuration Vital Product Data (VPD) */
-  if ( I2Cread_eeprom(0xa8, 4,2, &ConfVPD_buff[0], 150))
-     printk("I2Cread_eeprom() error \n");
-  else {
-#ifdef CONF_VPD
-    printk("\n");
-    for (i=0; i<150; i++) {
-      printk("%2x ", ConfVPD_buff[i]);
-      if ((i % 20)==0 ) printk("\n");
-    }
-    printk("\n");
-#endif
-  }
-
-  /*
-   * PCI 1 domain memory space
-   */
-  setdbat(1, PCI1_MEM_BASE, PCI1_MEM_BASE, 0x10000000, IO_PAGE);
-
-
-#ifdef SHOW_MORE_INIT_SETTINGS
-  printk("Going to start PCI buses scanning and initialization\n");
-#endif
-  pci_initialize();
-#ifdef SHOW_MORE_INIT_SETTINGS
-  printk("Number of PCI buses found is : %d\n", pci_bus_count());
-#endif
-
-  /* Install our own exception handler (needs PCI) */
-  globalExceptHdl = BSP_exceptionHandler;
-
-  /* clear hostbridge errors. MCP signal is not used on the MVME5500
-   * PCI config space scanning code will trip otherwise :-(
-   */
-  _BSP_clear_hostbridge_errors(0, 1 /*quiet*/);
-
-#ifdef SHOW_MORE_INIT_SETTINGS
-  printk("MSR %x \n", _read_MSR());
-  printk("Exit from bspstart\n");
-#endif
-
-}
-
-unsigned char ReadConfVPD_buff(int offset)
-{
-  return(ConfVPD_buff[offset]);
-}
-
-RTEMS_SYSINIT_ITEM(
-  BSP_vme_config,
-  RTEMS_SYSINIT_BSP_PRE_DRIVERS,
-  RTEMS_SYSINIT_ORDER_MIDDLE
-);
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/startup/linkcmds b/c/src/lib/libbsp/powerpc/mvme5500/startup/linkcmds
deleted file mode 100644
index 384b623474..0000000000
--- a/c/src/lib/libbsp/powerpc/mvme5500/startup/linkcmds
+++ /dev/null
@@ -1,5 +0,0 @@
-STARTUP(mvme5500start.o)
-ENTRY(__rtems_entry_point)
-EXTERN(__vectors)
-
-INCLUDE linkcmds.share
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/startup/pgtbl_activate.c b/c/src/lib/libbsp/powerpc/mvme5500/startup/pgtbl_activate.c
deleted file mode 100644
index 79725c6a06..0000000000
--- a/c/src/lib/libbsp/powerpc/mvme5500/startup/pgtbl_activate.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Default activation of the page tables. This is a weak
- * alias, so applications may easily override this
- * default activation procedure.
- */
-
-/* Author: Till Straumann, <strauman@slac.stanford.edu>, 4/2002
- * Kate Feng <feng1@bnl.gov> ported it to MVME5500, 4/2004
- */
-
-#include <rtems.h>
-#include <libcpu/pte121.h>
-#include <libcpu/bat.h>
-
-static void
-__BSP_default_pgtbl_activate(Triv121PgTbl pt)
-{
-  if (!pt)
-    return;
-
-  /* switch the text/ro sements to RO only after
-   * initializing the interrupts because the irq_mng
-   * installs some code...
-   *
-   * activate the page table; it is still masked by the
-   * DBAT0, however
-   */
-  triv121PgTblActivate(pt);
-
-  /* finally, switch off DBAT0 & DBAT1 */
-  setdbat(0,0,0,0,0);
-  setdbat(1,0,0,0,0);  /* <skf> */
-  /* At this point, DBAT0 is available for other use... */
-}
-
-void BSP_pgtbl_activate(Triv121PgTbl)
-  __attribute__ (( weak, alias("__BSP_default_pgtbl_activate") ));