Merged from 4.5.0-beta3a

This commit is contained in:
Joel Sherrill
2000-06-12 15:00:15 +00:00
parent 0ab6547431
commit df49c60c96
2120 changed files with 123526 additions and 13179 deletions

View File

@@ -1,6 +1,6 @@
##
##
## $Id$
##
##
AUTOMAKE_OPTIONS = foreign 1.4
ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

View File

@@ -1,6 +1,6 @@
##
##
## $Id$
##
##
AUTOMAKE_OPTIONS = foreign 1.4
ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

View File

@@ -1,6 +1,6 @@
##
##
## $Id$
##
##
AUTOMAKE_OPTIONS = foreign 1.4

View File

@@ -1,6 +1,6 @@
##
##
## $Id$
##
##
AUTOMAKE_OPTIONS = foreign 1.4

View File

@@ -18,9 +18,4 @@
#include <stdlib.h>
#include <assert.h>
void console_reserve_resources(
rtems_configuration_table *configuration
)
{
rtems_termios_reserve_resources( configuration, 2 );
}
int console_reserve_resources_removed;

View File

@@ -1,6 +1,6 @@
##
##
## $Id$
##
##
AUTOMAKE_OPTIONS = foreign 1.4

View File

@@ -1,6 +1,6 @@
##
##
## $Id$
##
##
AUTOMAKE_OPTIONS = foreign 1.4

View File

@@ -27,10 +27,20 @@ extern "C" {
#endif
#include <rtems.h>
#include <clockdrv.h>
#include <console.h>
#include <iosupp.h>
#include <erc32.h>
#include <clockdrv.h>
#include <console.h>
/*
* confdefs.h overrides for this BSP:
* - two termios serial ports
* - Interrupt stack space is not minimum if defined.
*/
#define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2
#define CONFIGURE_INTERRUPT_STACK_MEMORY (16 * 1024)
/*
* Define the time limits for RTEMS Test Suite test durations.

View File

@@ -1,6 +1,6 @@
##
##
## $Id$
##
##
AUTOMAKE_OPTIONS = foreign 1.4

View File

@@ -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)

View File

@@ -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

View File

@@ -143,7 +143,8 @@ SECTIONS
*(.data)
*(.gnu.linkonce.d*)
*(.gcc_except_table)
edata = ALIGN(0x10);
. = ALIGN(0x10);
edata = .;
_edata = .;
} > ram
.shbss :

View File

@@ -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;

View File

@@ -1,6 +1,6 @@
##
##
## $Id$
##
##
AUTOMAKE_OPTIONS = foreign 1.4

View File

@@ -5,11 +5,17 @@
AUTOMAKE_OPTIONS = foreign 1.4
ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
noinst_SCRIPTS=runtest
noinst_SCRIPTS = runtest
#HACK: install to build-tree
all-local: $(SCRIPTS)
$(mkinstalldirs) $(PROJECT_ROOT)/erc32/tests
$(INSTALL_SCRIPT) runtest $(PROJECT_ROOT)/erc32/tests/runtest
TMPINSTALL_FILES += $(PROJECT_ROOT)/erc32/tests \
$(PROJECT_ROOT)/erc32/tests/runtest
include $(top_srcdir)/../../../../../../../automake/local.am
$(PROJECT_ROOT)/erc32/tests:
$(mkinstalldirs) $@
$(PROJECT_ROOT)/erc32/tests/runtest: runtest
$(INSTALL_SCRIPT) $< $@
all-local: $(TMPINSTALL_FILES)
include $(top_srcdir)/../../../../../../../automake/host.am

View File

@@ -142,13 +142,13 @@ do
fatal "MP tests not supported"
warn "Skipping $tname; 'runtest' runs both nodes when for *-node1"
continue;;
*-node1*)
fatal "MP tests not supported"
*-node1*)
warn "Running both nodes associated with $tname"
variant=`echo $tname | sed 's/.*-node[12]//' | sed 's/\.exe//'`
tname=`echo $tname | sed 's/-node.*//'`
TEST_TYPE="mp"
;;
minimum*|stackchk*|spfatal*|malloctest*|termio*)
minimum*|stackchk*|spfatal*|termio*)
warn "Skipping $tname; it locks up or takes a VERY long time to run"
continue
;;

View File

@@ -1,6 +1,6 @@
##
##
## $Id$
##
##
AUTOMAKE_OPTIONS = foreign 1.4