Changeset 18aa55ee in rtems


Ignore:
Timestamp:
Sep 16, 2008, 7:03:48 PM (11 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, master
Children:
90014dc2
Parents:
a993d45
Message:

2008-09-16 Joel Sherrill <joel.sherrill@…>

  • Makefile.am, configure.ac, startup/bspstart.c, startup/linkcmds: Add use of bsp_get_work_area() in its own file and rely on BSP Framework to perform more initialization. Remove unnecessary includes of rtems/libio.h and rtems/libcsupport.h.
Location:
c/src/lib/libbsp/m68k
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/m68k/mvme147s/ChangeLog

    ra993d45 r18aa55ee  
     12008-09-16      Joel Sherrill <joel.sherrill@oarcorp.com>
     2
     3        * Makefile.am, configure.ac, startup/bspstart.c, startup/linkcmds: Add
     4        use of bsp_get_work_area() in its own file and rely on BSP Framework
     5        to perform more initialization. Remove unnecessary includes of
     6        rtems/libio.h and rtems/libcsupport.h.
     7
    182008-09-10      Joel Sherrill <joel.sherrill@oarcorp.com>
    29
  • c/src/lib/libbsp/m68k/mvme147s/Makefile.am

    ra993d45 r18aa55ee  
    3030    ../../shared/bsppost.c ../../shared/bsppredriverhook.c \
    3131    startup/bspstart.c ../../shared/bootcard.c \
    32     ../../m68k/shared/m68kpretaskinghook.c \
    33     ../../shared/sbrk.c ../../m68k/shared/setvec.c \
    34     ../../shared/gnatinstallhandler.c
     32    ../../shared/bsppretaskinghook.c ../../m68k/shared/setvec.c \
     33    ../../m68k/shared/m68kbspgetworkarea.c ../../m68k/shared/setvec.c \
     34    ../../shared/sbrk.c ../../shared/gnatinstallhandler.c
    3535clock_SOURCES = ../mvme147/clock/ckinit.c
    3636console_SOURCES = ../mvme147/console/console.c \
  • c/src/lib/libbsp/m68k/mvme147s/configure.ac

    ra993d45 r18aa55ee  
    1616RTEMS_PROG_CCAS
    1717
     18RTEMS_BSP_BOOTCARD_HANDLES_RAM_ALLOCATION
     19
    1820# Explicitly list all Makefiles here
    1921AC_CONFIG_FILES([Makefile])
  • c/src/lib/libbsp/m68k/mvme147s/startup/bspstart.c

    ra993d45 r18aa55ee  
    1919 */
    2020
    21 #include <string.h>
    22 
    2321#include <bsp.h>
    24 #include <rtems/libio.h>
    25 #include <rtems/libcsupport.h>
    26 
    27 /*
    28  *  Use the shared implementations of the following routines
    29  */
    30 
    31 void bsp_libc_init( void *, uint32_t, int );
    32 void bsp_pretasking_hook(void);               /* m68k version */
    3322
    3423/*
     
    3726 *  This routine does the bulk of the system initialization.
    3827 */
    39 
    4028void bsp_start( void )
    4129{
     
    4331  int                   index;
    4432  uint8_t               node_number;
    45   extern void          *_WorkspaceBase;
    46   extern void          *_RamSize;
    47   extern unsigned long  _M68k_Ramsize;
    48 
    49   _M68k_Ramsize = (unsigned long)&_RamSize;             /* RAM size set in linker script */
    5033
    5134  monitors_vector_table = (m68k_isr_entry *)0;   /* 147Bug Vectors are at 0 */
     
    130113  rtems_cache_enable_instruction();
    131114  rtems_cache_enable_data();
    132 
    133   Configuration.work_space_start = (void *) &_WorkspaceBase;
    134115}
  • c/src/lib/libbsp/m68k/mvme147s/startup/linkcmds

    ra993d45 r18aa55ee  
    2222_RamBase = DEFINED(_RamBase) ? _RamBase : 0x0;
    2323_RamSize = DEFINED(_RamSize) ? _RamSize : 4M;
    24 _HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x10000;
     24_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x0;
    2525_StackSize = DEFINED(_StackSize) ? _StackSize : 0x1000;
    2626
  • c/src/lib/libbsp/m68k/uC5282/ChangeLog

    ra993d45 r18aa55ee  
     12008-09-16      Joel Sherrill <joel.sherrill@oarcorp.com>
     2
     3        * Makefile.am, configure.ac, startup/bspstart.c, startup/linkcmds: Add
     4        use of bsp_get_work_area() in its own file and rely on BSP Framework
     5        to perform more initialization. Remove unnecessary includes of
     6        rtems/libio.h and rtems/libcsupport.h.
     7
    182008-09-10      Joel Sherrill <joel.sherrill@oarcorp.com>
    29
  • c/src/lib/libbsp/m68k/uC5282/Makefile.am

    ra993d45 r18aa55ee  
    2828startup_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
    2929    ../../shared/bsppost.c ../../shared/bsppredriverhook.c \
    30     ../../m68k/shared/m68kpretaskinghook.c startup/init5282.c \
    31     startup/bspstart.c ../../shared/bootcard.c ../../shared/sbrk.c \
    32     ../../m68k/shared/setvec.c ../../shared/gnatinstallhandler.c
     30    ../../shared/bsppretaskinghook.c ../../m68k/shared/m68kbspgetworkarea.c \
     31    startup/init5282.c startup/bspstart.c ../../shared/bootcard.c \
     32    ../../shared/sbrk.c ../../m68k/shared/setvec.c \
     33    ../../shared/gnatinstallhandler.c
    3334clock_SOURCES = clock/clock.c
    3435console_SOURCES = console/console.c
  • c/src/lib/libbsp/m68k/uC5282/configure.ac

    ra993d45 r18aa55ee  
    2020AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
    2121
     22RTEMS_BSP_BOOTCARD_HANDLES_RAM_ALLOCATION
     23
    2224# Explicitly list all Makefiles here
    2325AC_CONFIG_FILES([Makefile])
  • c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c

    ra993d45 r18aa55ee  
    2020
    2121#include <bsp.h>
    22 #include <rtems/libio.h>
    2322#include <rtems/error.h>
    24 #include <rtems/libcsupport.h>
    25 #include <stdio.h>
    26 #include <string.h>
    2723#include <errno.h>
    2824 
     
    3228#define VME_ONE_BASE    0x30000000
    3329#define VME_TWO_BASE    0x31000000
     30
     31/*
     32 * Linker Script Defined Variables
     33 */
     34extern char _RamSize[];
     35extern char _RamBase[];
    3436
    3537/*
     
    172174
    173175/*
    174  *  Use the shared implementations of the following routines
    175  */
    176 void bsp_libc_init( void *, uint32_t, int );
    177 void bsp_pretasking_hook(void);         /* m68k version */
    178 
    179 /*
    180176 * The Arcturus boot ROM prints exception information improperly
    181177 * so use this default exception handler instead.  This one also
     
    186182    int level;
    187183    static volatile int reent;
    188     extern char _RamSize[];
    189184
    190185    rtems_interrupt_disable(level);
     
    228223{
    229224  int i;
    230   extern char _WorkspaceBase[];
    231   extern char _RamBase[], _RamSize[];
    232   extern unsigned long  _M68k_Ramsize;
    233 
    234   _M68k_Ramsize = (unsigned long)_RamSize;      /* RAM size set in linker script */
    235 
    236   /*
    237    *  Allocate the memory for the RTEMS Work Space.  This can come from
    238    *  a variety of places: hard coded address, malloc'ed from outside
    239    *  RTEMS world (e.g. simulator or primitive memory manager), or (as
    240    *  typically done by stock BSPs) by subtracting the required amount
    241    *  of work space from the last physical address on the CPU board.
    242    */
    243 
    244     /*
    245      * Set up default exception handler
    246      */
    247     for (i = 2 ; i < 256 ; i++)
    248         if (i != (32+2)) /* Catch all but bootrom system calls */
    249             *((void (**)(int))(i * 4)) = handler;
    250 
    251   /*
    252    *  Need to "allocate" the memory for the RTEMS Workspace and
    253    *  tell the RTEMS configuration where it is.  This memory is
    254    *  not malloc'ed.  It is just "pulled from the air".
    255    */
    256 
    257   Configuration.work_space_start = (void *)_WorkspaceBase;
     225
     226  /*
     227   * Set up default exception handler
     228   */
     229  for (i = 2 ; i < 256 ; i++)
     230      if (i != (32+2)) /* Catch all but bootrom system calls */
     231          *((void (**)(int))(i * 4)) = handler;
    258232
    259233  /*
     
    302276}
    303277
     278extern char _CPUClockSpeed[];
     279
    304280uint32_t bsp_get_CPU_clock_speed(void)
    305281{
    306   extern char _CPUClockSpeed[];
    307282  return( (uint32_t)_CPUClockSpeed);
    308283}
  • c/src/lib/libbsp/m68k/uC5282/startup/linkcmds

    ra993d45 r18aa55ee  
    1818 * Declare some locations and sizes.
    1919 */
    20 _RamBase = DEFINED(_RamBase) ? _RamBase : 0x0 ;
    21 _RamSize = DEFINED(_RamSize) ? _RamSize : 16M ;
    22 _HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0 ;
    23 _FlashBase = DEFINED(_FlashBase) ? _FlashBase : 0x10000000 ;
     20_RamBase = DEFINED(_RamBase) ? _RamBase : 0x0;
     21_RamSize = DEFINED(_RamSize) ? _RamSize : 16M;
     22_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0;
     23_FlashBase = DEFINED(_FlashBase) ? _FlashBase : 0x10000000;
    2424_FlashSize = DEFINED(_FlashSize) ? _FlashSize : 4M ;
    2525
Note: See TracChangeset for help on using the changeset viewer.