diff options
| -rw-r--r-- | c/src/lib/libbsp/sparc/erc32/ChangeLog | 7 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sparc/erc32/include/erc32.h | 2 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sparc/erc32/startup/Makefile.am | 2 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sparc/erc32/startup/erc32mec.c | 18 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sparc/erc32/tools/runtest.in | 2 |
5 files changed, 28 insertions, 3 deletions
diff --git a/c/src/lib/libbsp/sparc/erc32/ChangeLog b/c/src/lib/libbsp/sparc/erc32/ChangeLog index 136de30a92..6479394b2f 100644 --- a/c/src/lib/libbsp/sparc/erc32/ChangeLog +++ b/c/src/lib/libbsp/sparc/erc32/ChangeLog @@ -1,3 +1,10 @@ +2002-07-01 Joel Sherrill <joel@OARcorp.com> + + * startup/erc32mec.c: New file. + * startup/Makefile.am: Reflect above. + * include/erc32.h: Converted SCORE_EXTERN to extern. + * tools/runtest.in: Lengthened timeout on test runs. + 2002-06-29 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * wrapup/Makefile.am: Remove preinstallation of libbsp.a, diff --git a/c/src/lib/libbsp/sparc/erc32/include/erc32.h b/c/src/lib/libbsp/sparc/erc32/include/erc32.h index 6ba8e7efe5..0d2e23da01 100644 --- a/c/src/lib/libbsp/sparc/erc32/include/erc32.h +++ b/c/src/lib/libbsp/sparc/erc32/include/erc32.h @@ -448,7 +448,7 @@ extern ERC32_Register_Map ERC32_MEC; #define ERC32_MEC_TIMER_COUNTER_DEFINED_MASK 0x0000000F #define ERC32_MEC_TIMER_COUNTER_CURRENT_MODE_MASK 0x00000005 -SCORE_EXTERN unsigned32 _ERC32_MEC_Timer_Control_Mirror; +extern unsigned32 _ERC32_MEC_Timer_Control_Mirror; /* * This macros manipulate the General Purpose Timer portion of the diff --git a/c/src/lib/libbsp/sparc/erc32/startup/Makefile.am b/c/src/lib/libbsp/sparc/erc32/startup/Makefile.am index 163c1ab859..f4b2c609ff 100644 --- a/c/src/lib/libbsp/sparc/erc32/startup/Makefile.am +++ b/c/src/lib/libbsp/sparc/erc32/startup/Makefile.am @@ -8,7 +8,7 @@ VPATH = @srcdir@:@srcdir@/../../shared:@srcdir@/../../../shared PGM = $(ARCH)/startup.rel C_FILES = bspclean.c bsplibc.c bsppost.c bspstart.c main.c bootcard.c sbrk.c \ - setvec.c spurious.c + setvec.c spurious.c erc32mec.c C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) S_FILES = boardinit.S diff --git a/c/src/lib/libbsp/sparc/erc32/startup/erc32mec.c b/c/src/lib/libbsp/sparc/erc32/startup/erc32mec.c new file mode 100644 index 0000000000..b41b2ba6a4 --- /dev/null +++ b/c/src/lib/libbsp/sparc/erc32/startup/erc32mec.c @@ -0,0 +1,18 @@ +/* + * Put this variable in a separate file so it is only linked in when needed. + * + * COPYRIGHT (c) 1989-2002. + * On-Line Applications Research Corporation (OAR). + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.OARcorp.com/rtems/license.html. + * + * $Id$ + */ + +#include <rtems.h> +#include <bsp.h> + +ERC32_Register_Map ERC32_MEC; + diff --git a/c/src/lib/libbsp/sparc/erc32/tools/runtest.in b/c/src/lib/libbsp/sparc/erc32/tools/runtest.in index c550565069..e7cc432a47 100644 --- a/c/src/lib/libbsp/sparc/erc32/tools/runtest.in +++ b/c/src/lib/libbsp/sparc/erc32/tools/runtest.in @@ -76,7 +76,7 @@ stdio_setup="yes" run_to_completion="yes" logdir=log update_on_tick="no" -max_run_time=$((5 * 60)) +max_run_time=$((10 * 60)) using_print_buffer="yes" while getopts vhr12o:c:sl:t OPT |