diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-06-12 15:00:15 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-06-12 15:00:15 +0000 |
| commit | df49c60c9671e4a28e636964d744c1f59fb6cb68 (patch) | |
| tree | eabd85e189514ad412a35414ba5d483dcda3ef1f /c/src/lib/libbsp/m68k/dmv152/startup | |
| parent | Purged as many egcs references as possible. (diff) | |
| download | rtems-df49c60c9671e4a28e636964d744c1f59fb6cb68.tar.bz2 | |
Merged from 4.5.0-beta3a
Diffstat (limited to 'c/src/lib/libbsp/m68k/dmv152/startup')
| -rw-r--r-- | c/src/lib/libbsp/m68k/dmv152/startup/Makefile.am | 7 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/dmv152/startup/bspstart.c | 12 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/dmv152/startup/linkcmds | 5 |
3 files changed, 12 insertions, 12 deletions
diff --git a/c/src/lib/libbsp/m68k/dmv152/startup/Makefile.am b/c/src/lib/libbsp/m68k/dmv152/startup/Makefile.am index 202c1ce798..ea99713294 100644 --- a/c/src/lib/libbsp/m68k/dmv152/startup/Makefile.am +++ b/c/src/lib/libbsp/m68k/dmv152/startup/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -22,6 +22,9 @@ include $(top_srcdir)/../../../../../../automake/lib.am # (OPTIONAL) Add local stuff here using += # +# USE_INIT_FINI tells main.c what C++ help we need. +AM_CPPFLAGS += -DUSE_INIT_FINI + $(PGM): $(OBJS) $(make-rel) diff --git a/c/src/lib/libbsp/m68k/dmv152/startup/bspstart.c b/c/src/lib/libbsp/m68k/dmv152/startup/bspstart.c index 90f171ef0a..8f4b3118b6 100644 --- a/c/src/lib/libbsp/m68k/dmv152/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/dmv152/startup/bspstart.c @@ -53,6 +53,10 @@ void bsp_start( void ) int index; void *vbr; extern void *_WorkspaceBase; + extern void *_RamSize; + extern unsigned long _M68k_Ramsize; + + _M68k_Ramsize = (unsigned long)&_RamSize; /* RAM size set in linker script */ monitors_vector_table = (m68k_isr_entry *)0; /* Monitor Vectors are at 0 */ m68k_set_vbr( monitors_vector_table ); @@ -89,18 +93,12 @@ void bsp_start( void ) Cpu_table.pretasking_hook = bsp_pretasking_hook; /* init libc, etc. */ Cpu_table.postdriver_hook = bsp_postdriver_hook; Cpu_table.do_zero_of_workspace = TRUE; - Cpu_table.interrupt_stack_size = 4096; + Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; m68k_get_vbr( vbr ); Cpu_table.interrupt_vector_table = vbr; BSP_Configuration.work_space_start = (void *) &_WorkspaceBase; - /* - * Account for the console's resources - */ - - console_reserve_resources( &BSP_Configuration ); - /* Clock_exit is done as an atexit() function */ } diff --git a/c/src/lib/libbsp/m68k/dmv152/startup/linkcmds b/c/src/lib/libbsp/m68k/dmv152/startup/linkcmds index 7f92758e77..8edc69ee94 100644 --- a/c/src/lib/libbsp/m68k/dmv152/startup/linkcmds +++ b/c/src/lib/libbsp/m68k/dmv152/startup/linkcmds @@ -15,6 +15,8 @@ /* * Declare some sizes. */ +_RamBase = DEFINED(_RamBase) ? _RamBase : 0x0; +_RamSize = DEFINED(_RamSize) ? _RamSize : 1M; _HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x10000; _StackSize = DEFINED(_StackSize) ? _StackSize : 0x1000; @@ -23,9 +25,6 @@ MEMORY ram : org = 0x0, l = 1M } -_RamBase = 0; -_RamSize = 1M; - SECTIONS { ram : { |