RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

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

Browse Source 
* Makefile.am, configure.ac, clock/ckinit.c, startup/bspstart.c: 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.
This commit is contained in:
Joel Sherrill
2008-09-16 19:03:42 +00:00
parent 47733692fb
commit e779190665
5 changed files with 12 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
c/src/lib/libbsp/m68k/mvme167/ChangeLog
View File

@@ -1,3 +1,10 @@
2008-09-16 Joel Sherrill <joel.sherrill@oarcorp.com>
* Makefile.am, configure.ac, clock/ckinit.c, startup/bspstart.c: 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.
2008-09-10 Joel Sherrill <joel.sherrill@oarcorp.com> 2008-09-10 Joel Sherrill <joel.sherrill@oarcorp.com>
* include/bsp.h: Review of all bsp_cleanup() implementations. In this * include/bsp.h: Review of all bsp_cleanup() implementations. In this

5
c/src/lib/libbsp/m68k/mvme167/Makefile.am
View File

@@ -32,9 +32,10 @@ dist_project_lib_DATA += startup/linkcmds
startup_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \ startup_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
../../shared/bsppredriverhook.c \ ../../shared/bsppredriverhook.c \
../../m68k/shared/m68kbspgetworkarea.c \
../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \ ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \
../../m68k/shared/m68kpretaskinghook.c \ ../../shared/bsppretaskinghook.c startup/page_table.c \
startup/page_table.c ../../shared/sbrk.c ../../m68k/shared/setvec.c \ ../../shared/sbrk.c ../../m68k/shared/setvec.c \
../../shared/gnatinstallhandler.c ../../shared/gnatinstallhandler.c
clock_SOURCES = clock/ckinit.c clock_SOURCES = clock/ckinit.c
console_SOURCES = console/console.c console/console-recording.h console_SOURCES = console/console.c console/console-recording.h

1
c/src/lib/libbsp/m68k/mvme167/clock/ckinit.c
View File

@@ -28,7 +28,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <bsp.h> #include <bsp.h>
#include <rtems/libio.h>
#define MS_COUNT 1000 /* T2's countdown constant (1 ms) */ #define MS_COUNT 1000 /* T2's countdown constant (1 ms) */
#define CLOCK_INT_LEVEL 6 /* T2's interrupt level */ #define CLOCK_INT_LEVEL 6 /* T2's interrupt level */

2
c/src/lib/libbsp/m68k/mvme167/configure.ac
View File

@@ -51,6 +51,8 @@ RTEMS_BSPOPTS_HELP([PRINTK_MINOR],
2 - /dev/tty2, Serial Port 3 on the MVME712M. 2 - /dev/tty2, Serial Port 3 on the MVME712M.
3 - /dev/tty3, Serial Port 4 on the MVME712M.]) 3 - /dev/tty3, Serial Port 4 on the MVME712M.])
RTEMS_BSP_BOOTCARD_HANDLES_RAM_ALLOCATION
# Explicitly list all Makefiles here # Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([Makefile])
AC_OUTPUT AC_OUTPUT

26
c/src/lib/libbsp/m68k/mvme167/startup/bspstart.c
View File

@@ -18,25 +18,13 @@
* $Id$ * $Id$
*/ */
#include <string.h>
#include <bsp.h> #include <bsp.h>
#include <rtems/libio.h>
#include <rtems/libcsupport.h>
#include <page_table.h> #include <page_table.h>
#include <fatal.h> #include <fatal.h>
/* XXX If RTEMS let the BSP replace the default fatal error handler... */ /* XXX If RTEMS let the BSP replace the default fatal error handler... */
rtems_extensions_table user_extension_table; rtems_extensions_table user_extension_table;
/*
* Use the shared implementations of the following routines.
* Look in rtems/c/src/lib/libbsp/shared/bsppost.c and
* rtems/c/src/lib/libbsp/shared/bsplibc.c.
*/
void bsp_libc_init( void *, uint32_t, int );
void bsp_pretasking_hook(void); /* m68k version */
/* /*
* bsp_start() * bsp_start()
* *
@@ -67,18 +55,11 @@ void bsp_pretasking_hook(void); /* m68k version */
void bsp_start( void ) void bsp_start( void )
{ {
void M68KFPSPInstallExceptionHandlers (void); void M68KFPSPInstallExceptionHandlers (void);
extern m68k_isr_entry M68Kvec[]; extern m68k_isr_entry M68Kvec[];
extern void *_WorkspaceBase;
extern void *_RamSize;
extern unsigned long _M68k_Ramsize;
m68k_isr_entry *rom_monitor_vector_table; m68k_isr_entry *rom_monitor_vector_table;
int index; int index;
/* RAM size set in linker script */
_M68k_Ramsize = (unsigned long)&_RamSize;
/* /*
* 167Bug Vectors are at 0xFFE00000 * 167Bug Vectors are at 0xFFE00000
*/ */
@@ -124,11 +105,4 @@ void bsp_start( void )
user_extension_table.fatal = bsp_fatal_error_occurred; user_extension_table.fatal = bsp_fatal_error_occurred;
Configuration.User_extension_table = &user_extension_table; Configuration.User_extension_table = &user_extension_table;
} }
/*
* Need to "allocate" the memory for the RTEMS Workspace and
* tell the RTEMS configuration where it is. This memory is
* not malloc'ed. It is just "pulled from the air".
*/
Configuration.work_space_start = (void *)&_WorkspaceBase;
} }