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/sparc/erc32/startup | |
parent | Purged as many egcs references as possible. (diff) | |
download | rtems-df49c60c9671e4a28e636964d744c1f59fb6cb68.tar.bz2 |
Merged from 4.5.0-beta3a
Diffstat (limited to '')
-rw-r--r-- | c/src/lib/libbsp/sparc/erc32/startup/Makefile.am | 5 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/erc32/startup/bspstart.c | 14 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/erc32/startup/linkcmds | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/erc32/startup/spurious.c | 3 |
4 files changed, 7 insertions, 18 deletions
diff --git a/c/src/lib/libbsp/sparc/erc32/startup/Makefile.am b/c/src/lib/libbsp/sparc/erc32/startup/Makefile.am index 540fe1f7a6..766ef8cced 100644 --- a/c/src/lib/libbsp/sparc/erc32/startup/Makefile.am +++ b/c/src/lib/libbsp/sparc/erc32/startup/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -22,7 +22,6 @@ include $(top_srcdir)/../../../../../../automake/lib.am # # USE_INIT_FINI tells main.c what C++ help we need. - AM_CPPFLAGS += -DUSE_INIT_FINI $(PGM): $(OBJS) diff --git a/c/src/lib/libbsp/sparc/erc32/startup/bspstart.c b/c/src/lib/libbsp/sparc/erc32/startup/bspstart.c index f2f2554072..cd3df53b29 100644 --- a/c/src/lib/libbsp/sparc/erc32/startup/bspstart.c +++ b/c/src/lib/libbsp/sparc/erc32/startup/bspstart.c @@ -212,13 +212,7 @@ void bsp_start( void ) * This should be enough interrupt stack. */ - Cpu_table.interrupt_stack_size = (24 * 1024); - -/* -#if defined(RTEMS_POSIX_API) - BSP_Configuration.work_space_size *= 3; -#endif -*/ + Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; work_space_start = (unsigned char *)rdb_start - BSP_Configuration.work_space_size; @@ -230,12 +224,6 @@ void bsp_start( void ) BSP_Configuration.work_space_start = work_space_start; - /* - * Account for the console's resources - */ - - console_reserve_resources( &BSP_Configuration ); - #if SIMSPARC_FAST_IDLE /* * Add 1 extension for fast idle diff --git a/c/src/lib/libbsp/sparc/erc32/startup/linkcmds b/c/src/lib/libbsp/sparc/erc32/startup/linkcmds index b12ff32f77..ff78e8d74c 100644 --- a/c/src/lib/libbsp/sparc/erc32/startup/linkcmds +++ b/c/src/lib/libbsp/sparc/erc32/startup/linkcmds @@ -143,7 +143,8 @@ SECTIONS *(.data) *(.gnu.linkonce.d*) *(.gcc_except_table) - edata = ALIGN(0x10); + . = ALIGN(0x10); + edata = .; _edata = .; } > ram .shbss : diff --git a/c/src/lib/libbsp/sparc/erc32/startup/spurious.c b/c/src/lib/libbsp/sparc/erc32/startup/spurious.c index c22a5373e2..93694d47e4 100644 --- a/c/src/lib/libbsp/sparc/erc32/startup/spurious.c +++ b/c/src/lib/libbsp/sparc/erc32/startup/spurious.c @@ -182,7 +182,8 @@ void bsp_spurious_initialize() (( trap >= 0x70 ) && ( trap <= 0x83 ))) continue; - set_vector( bsp_spurious_handler, SPARC_SYNCHRONOUS_TRAP( trap ), 1 ); + set_vector( (rtems_isr_entry) bsp_spurious_handler, + SPARC_SYNCHRONOUS_TRAP( trap ), 1 ); } ERC32_MEC.Interrupt_Mask = mask; |