Changeset 4773369 in rtems


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

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

  • Makefile.am, configure.ac, clock/ckinit.c, 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:
18 edited

Legend:

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

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

    r2c5862d1 r4773369  
    3030    ../../shared/bsppredriverhook.c \
    3131    ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \
    32     ../../m68k/shared/m68kpretaskinghook.c \
     32    ../../shared/bsppretaskinghook.c ../../m68k/shared/m68kbspgetworkarea.c \
    3333    ../../shared/sbrk.c ../../m68k/shared/setvec.c \
    3434    ../../shared/gnatinstallhandler.c
  • c/src/lib/libbsp/m68k/idp/clock/ckinit.c

    r2c5862d1 r4773369  
    2727
    2828#include <bsp.h>
    29 #include <rtems/libio.h>
    3029
    31 uint32_t         Clock_isrs;        /* ISRs until next tick */
     30uint32_t                  Clock_isrs;        /* ISRs until next tick */
    3231volatile uint32_t         Clock_driver_ticks;
    3332                                    /* ticks since initialization */
  • c/src/lib/libbsp/m68k/idp/configure.ac

    r2c5862d1 r4773369  
    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/idp/startup/bspstart.c

    r2c5862d1 r4773369  
    1515 */
    1616
    17 #include <string.h>
    18 
    1917#include <bsp.h>
    20 #include <rtems/libio.h>
    21 #include <rtems/libcsupport.h>
    2218
    2319unsigned char *duart_base;
     
    2925
    3026/*
    31  *  Use the shared implementations of the following routines
    32  */
    33 
    34 void bsp_libc_init( void *, uint32_t, int );
    35 void bsp_pretasking_hook(void);               /* m68k version */
    36 
    37 /*
    3827 *  bsp_start
    3928 *
    4029 *  This routine does the bulk of the system initialization.
    4130 */
    42 
    4331void bsp_start( void )
    4432{
    45   m68k_isr_entry *monitors_vector_table;
    46   int             index;
    47   extern void          *_WorkspaceBase;
    48   extern void          *_RamSize;
    49   extern unsigned long  _M68k_Ramsize;
     33  m68k_isr_entry       *monitors_vector_table;
     34  int                   index;
    5035
    5136  /* RAM size set in linker script */
    52   _M68k_Ramsize = (unsigned long)&_RamSize;
    5337  duart_base    = (unsigned char *)DUART_ADDR;
    5438
     
    5640   *  Set the VBR here to the monitor's default.
    5741   */
    58 
    5942  monitors_vector_table = (m68k_isr_entry *)0;
    6043   /* This is where you set vector base register = 0 */
     
    6245
    6346  /* The vector interrupt table for the 680x0 is in appendix B-2
    64          of the M68000 Family Programmer's reference table */
     47   *  of the M68000 Family Programmer's reference table
     48   */
    6549  for ( index=2 ; index<=255 ; index++ )
    6650    M68Kvec[ index ] = monitors_vector_table[ 32 ];
     
    7963  rtems_cache_enable_data();
    8064
    81   Configuration.work_space_start = (void *) &_WorkspaceBase;
    82 
    8365/*  led_putnum('e'); * for debugging purposes only */
    84 
    85   /* Clock_exit is done as an atexit() function */
    8666}
  • c/src/lib/libbsp/m68k/idp/startup/linkcmds

    r2c5862d1 r4773369  
    2323_RamBase = DEFINED(_RamBase) ? _RamBase : 0x0;
    2424_RamSize = DEFINED(_RamSize) ? _RamSize : 2M;
    25 _HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x10000;
     25_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x0;
    2626_StackSize = DEFINED(_StackSize) ? _StackSize : 0x1000;
    2727
  • c/src/lib/libbsp/m68k/mvme147/ChangeLog

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

    r2c5862d1 r4773369  
    2929startup_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
    3030    ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \
    31     ../../m68k/shared/m68kpretaskinghook.c ../../shared/bsppredriverhook.c \
    32     ../../shared/sbrk.c ../../m68k/shared/setvec.c \
    33     ../../shared/gnatinstallhandler.c
     31    ../../shared/bsppretaskinghook.c ../../shared/bsppredriverhook.c \
     32    ../../m68k/shared/m68kbspgetworkarea.c ../../shared/sbrk.c \
     33    ../../m68k/shared/setvec.c ../../shared/gnatinstallhandler.c
    3434clock_SOURCES = clock/ckinit.c
    3535console_SOURCES = console/console.c ../../shared/dummy_printk_support.c
  • c/src/lib/libbsp/m68k/mvme147/clock/ckinit.c

    r2c5862d1 r4773369  
    2525
    2626#include <bsp.h>
    27 #include <rtems/libio.h>
    2827
    2928#define MS_COUNT          65376    /* 1ms */
  • c/src/lib/libbsp/m68k/mvme147/configure.ac

    r2c5862d1 r4773369  
    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/mvme147/startup/bspstart.c

    r2c5862d1 r4773369  
    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/*
     
    4029void bsp_start( void )
    4130{
    42   m68k_isr_entry *monitors_vector_table;
    43   int             index;
    44   extern void          *_WorkspaceBase;
    45   extern void          *_RamSize;
    46   extern unsigned long  _M68k_Ramsize;
    47 
    48   /* RAM size set in linker script */
    49   _M68k_Ramsize = (unsigned long)&_RamSize;
     31  m68k_isr_entry       *monitors_vector_table;
     32  int                   index;
    5033
    5134  monitors_vector_table = (m68k_isr_entry *)0;   /* 135Bug Vectors are at 0 */
     
    6952  rtems_cache_enable_instruction();
    7053  rtems_cache_enable_data();
    71 
    72   Configuration.work_space_start = (void *) &_WorkspaceBase;
    7354}
  • c/src/lib/libbsp/m68k/mvme147/startup/linkcmds

    r2c5862d1 r4773369  
    2222_RamBase = DEFINED(_RamBase) ? _RamBase : 0x0;
    2323_RamSize = DEFINED(_RamSize) ? _RamSize : 4M;
    24 _HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x10000;
    2524_StackSize = DEFINED(_StackSize) ? _StackSize : 0x1000;
     25_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x0;
    2626
    2727MEMORY
  • c/src/lib/libbsp/m68k/mvme162/ChangeLog

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

    r2c5862d1 r4773369  
    3838startup_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
    3939    ../../shared/bsppredriverhook.c ../../shared/bsppost.c \
    40     startup/bspstart.c ../../shared/bootcard.c \
    41     ../../m68k/shared/m68kpretaskinghook.c \
    42     startup/page_table.c ../../shared/sbrk.c ../../m68k/shared/setvec.c \
     40    startup/bspstart.c ../../shared/bootcard.c  \
     41    ../../shared/bsppretaskinghook.c startup/page_table.c \
     42    ../../m68k/shared/m68kbspgetworkarea.c startup/page_table.c \
     43    ../../shared/sbrk.c ../../m68k/shared/setvec.c \
    4344    ../../shared/gnatinstallhandler.c
    4445clock_SOURCES = clock/ckinit.c
  • c/src/lib/libbsp/m68k/mvme162/clock/ckinit.c

    r2c5862d1 r4773369  
    2828
    2929#include <bsp.h>
    30 #include <rtems/libio.h>
    3130
    3231#define MS_COUNT          1000            /* T2's countdown constant (1 ms) */
  • c/src/lib/libbsp/m68k/mvme162/configure.ac

    r2c5862d1 r4773369  
    2323AM_CONDITIONAL([HAS_FPSP],[test "$RTEMS_CPU_MODEL" = "m68040"])
    2424
     25RTEMS_BSP_BOOTCARD_HANDLES_RAM_ALLOCATION
     26
    2527# Explicitly list all Makefiles here
    2628AC_CONFIG_FILES([Makefile])
  • c/src/lib/libbsp/m68k/mvme162/startup/bspstart.c

    r2c5862d1 r4773369  
    2222 */
    2323
    24 #include <string.h>
    25 
    2624#include <bsp.h>
    27 #include <rtems/libio.h>
    28 #include <rtems/libcsupport.h>
    2925#include <page_table.h>
    30 
    31 /*
    32  *  Use the shared implementations of the following routines
    33  */
    34 
    35 void bsp_libc_init( void *, uint32_t, int );
    36 void bsp_pretasking_hook(void);               /* m68k version */
    3726
    3827/*
     
    4130 *  This routine does the bulk of the system initialization.
    4231 */
    43 
    4432void bsp_start( void )
    4533{
    4634  m68k_isr_entry       *monitors_vector_table;
    4735  int                   index;
    48   extern void          *_WorkspaceBase;
    49   extern void          *_RamSize;
    50   extern unsigned long  _M68k_Ramsize;
    51 
    52   _M68k_Ramsize = (unsigned long)&_RamSize;  /* RAM size set in linker script */
    5336
    5437  /*
     
    8568
    8669  page_table_init();
    87 
    88   Configuration.work_space_start = (void *) &_WorkspaceBase;
    8970}
  • c/src/lib/libbsp/m68k/mvme162/startup/linkcmds

    r2c5862d1 r4773369  
    2525_RamBase = DEFINED(_RamBase) ? _RamBase : 0x20000;
    2626_RamSize = DEFINED(_RamSize) ? _RamSize : 1M;
    27 _HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x10000;
     27_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x0;
    2828_StackSize = DEFINED(_StackSize) ? _StackSize : 0x1000;
    2929
Note: See TracChangeset for help on using the changeset viewer.