diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-01-13 20:45:07 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-01-13 20:45:07 +0000 |
commit | b8c98837559029b807fc80b54d170b2c3184df1f (patch) | |
tree | 8ebc7a418213c792f6f6bc0c46daff05d5b56c12 /c/src/lib/libbsp/m68k/dmv152 | |
parent | POSIX message queues now include complete functionality including (diff) | |
download | rtems-b8c98837559029b807fc80b54d170b2c3184df1f.tar.bz2 |
All m68k BSPs now build with new ELF style linkcmds.
Diffstat (limited to 'c/src/lib/libbsp/m68k/dmv152')
-rw-r--r-- | c/src/lib/libbsp/m68k/dmv152/include/bsp.h | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/dmv152/startup/Makefile.in | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/dmv152/startup/bspstart.c | 31 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/dmv152/startup/linkcmds | 18 |
4 files changed, 13 insertions, 43 deletions
diff --git a/c/src/lib/libbsp/m68k/dmv152/include/bsp.h b/c/src/lib/libbsp/m68k/dmv152/include/bsp.h index 59d91c4537..20b711b461 100644 --- a/c/src/lib/libbsp/m68k/dmv152/include/bsp.h +++ b/c/src/lib/libbsp/m68k/dmv152/include/bsp.h @@ -120,9 +120,6 @@ extern "C" { /* constants */ -#define RAM_START 0 -#define RAM_END 0x100000 - #define TIMER 0x0c000000 #define TIMER_VECTOR 0x4D diff --git a/c/src/lib/libbsp/m68k/dmv152/startup/Makefile.in b/c/src/lib/libbsp/m68k/dmv152/startup/Makefile.in index ad1bdae884..43f6192b6d 100644 --- a/c/src/lib/libbsp/m68k/dmv152/startup/Makefile.in +++ b/c/src/lib/libbsp/m68k/dmv152/startup/Makefile.in @@ -16,8 +16,8 @@ VPATH = @srcdir@:@srcdir@/../../shared:@srcdir@/../../../shared PGM = ${ARCH}/startup.rel # C source names, if any, go here -- minus the .c -C_PIECES = bspclean bsplibc bsppost bspstart bootcard main sbrk setvec \ - vmeintr gnatinstallhandler +C_PIECES = bspclean bsplibc bsppost bspstart bootcard m68kpretaskinghook \ + main sbrk setvec vmeintr gnatinstallhandler C_FILES = $(C_PIECES:%=%.c) C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) diff --git a/c/src/lib/libbsp/m68k/dmv152/startup/bspstart.c b/c/src/lib/libbsp/m68k/dmv152/startup/bspstart.c index 25e9d86629..90f171ef0a 100644 --- a/c/src/lib/libbsp/m68k/dmv152/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/dmv152/startup/bspstart.c @@ -39,32 +39,7 @@ char *rtems_progname; void bsp_postdriver_hook(void); void bsp_libc_init( void *, unsigned32, int ); - -/* - * Function: bsp_pretasking_hook - * Created: 95/03/10 - * - * Description: - * BSP pretasking hook. Called just before drivers are initialized. - * Used to setup libc and install any BSP extensions. - * - * NOTES: - * Must not use libc (to do io) from here, since drivers are - * not yet initialized. - * - */ - -void bsp_pretasking_hook(void) -{ - extern void *_HeapStart; - extern rtems_unsigned32 HeapSize; - - bsp_libc_init( &_HeapStart, HeapSize, 0 ); - -#ifdef RTEMS_DEBUG - rtems_debug_enable( RTEMS_DEBUG_ALL_MASK ); -#endif -} +void bsp_pretasking_hook(void); /* m68k version */ /* * bsp_start @@ -77,6 +52,7 @@ void bsp_start( void ) m68k_isr_entry *monitors_vector_table; int index; void *vbr; + extern void *_WorkspaceBase; monitors_vector_table = (m68k_isr_entry *)0; /* Monitor Vectors are at 0 */ m68k_set_vbr( monitors_vector_table ); @@ -118,8 +94,7 @@ void bsp_start( void ) m68k_get_vbr( vbr ); Cpu_table.interrupt_vector_table = vbr; - BSP_Configuration.work_space_start = (void *) - (RAM_END - BSP_Configuration.work_space_size); + BSP_Configuration.work_space_start = (void *) &_WorkspaceBase; /* * Account for the console's resources diff --git a/c/src/lib/libbsp/m68k/dmv152/startup/linkcmds b/c/src/lib/libbsp/m68k/dmv152/startup/linkcmds index 2e6ec77838..7f92758e77 100644 --- a/c/src/lib/libbsp/m68k/dmv152/startup/linkcmds +++ b/c/src/lib/libbsp/m68k/dmv152/startup/linkcmds @@ -15,14 +15,17 @@ /* * Declare some sizes. */ -HeapSize = DEFINED(HeapSize) ? HeapSize : 0x10000; -StackSize = DEFINED(StackSize) ? StackSize : 0x1000; +_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x10000; +_StackSize = DEFINED(_StackSize) ? _StackSize : 0x1000; MEMORY { ram : org = 0x0, l = 1M } +_RamBase = 0; +_RamSize = 1M; + SECTIONS { ram : { @@ -117,15 +120,10 @@ SECTIONS . = ALIGN (16); PROVIDE (end = .); - . += StackSize; - PROVIDE (_stack_init = .); - + . += _StackSize; . = ALIGN (16); - PROVIDE (_HeapStart = .); - . += HeapSize; - PROVIDE (_HeapEnd = .); - - PROVIDE (_clear_end = .); + _stack_init = .; + _clear_end = .; _WorkspaceBase = .; } >ram |