From df49c60c9671e4a28e636964d744c1f59fb6cb68 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 12 Jun 2000 15:00:15 +0000 Subject: Merged from 4.5.0-beta3a --- c/src/lib/libbsp/i960/cvme961/Makefile.am | 4 ++-- c/src/lib/libbsp/i960/cvme961/clock/Makefile.am | 4 ++-- c/src/lib/libbsp/i960/cvme961/console/Makefile.am | 4 ++-- c/src/lib/libbsp/i960/cvme961/include/Makefile.am | 4 ++-- c/src/lib/libbsp/i960/cvme961/include/bsp.h | 9 +++++++++ c/src/lib/libbsp/i960/cvme961/shmsupp/Makefile.am | 4 ++-- c/src/lib/libbsp/i960/cvme961/start/Makefile.am | 4 ++-- c/src/lib/libbsp/i960/cvme961/startup/Makefile.am | 4 ++-- c/src/lib/libbsp/i960/cvme961/startup/bspstart.c | 2 +- c/src/lib/libbsp/i960/cvme961/timer/Makefile.am | 4 ++-- c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.am | 8 +++----- 11 files changed, 29 insertions(+), 22 deletions(-) (limited to 'c/src/lib/libbsp/i960/cvme961') diff --git a/c/src/lib/libbsp/i960/cvme961/Makefile.am b/c/src/lib/libbsp/i960/cvme961/Makefile.am index 68e67cb540..a519d840a1 100644 --- a/c/src/lib/libbsp/i960/cvme961/Makefile.am +++ b/c/src/lib/libbsp/i960/cvme961/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal diff --git a/c/src/lib/libbsp/i960/cvme961/clock/Makefile.am b/c/src/lib/libbsp/i960/cvme961/clock/Makefile.am index 0b1ebe8a61..3e08045c00 100644 --- a/c/src/lib/libbsp/i960/cvme961/clock/Makefile.am +++ b/c/src/lib/libbsp/i960/cvme961/clock/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/i960/cvme961/console/Makefile.am b/c/src/lib/libbsp/i960/cvme961/console/Makefile.am index 82b58ef82e..d4e5619fac 100644 --- a/c/src/lib/libbsp/i960/cvme961/console/Makefile.am +++ b/c/src/lib/libbsp/i960/cvme961/console/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/i960/cvme961/include/Makefile.am b/c/src/lib/libbsp/i960/cvme961/include/Makefile.am index 23c4b21b47..1d6c3074ec 100644 --- a/c/src/lib/libbsp/i960/cvme961/include/Makefile.am +++ b/c/src/lib/libbsp/i960/cvme961/include/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/i960/cvme961/include/bsp.h b/c/src/lib/libbsp/i960/cvme961/include/bsp.h index e023114c88..e00d525e7b 100644 --- a/c/src/lib/libbsp/i960/cvme961/include/bsp.h +++ b/c/src/lib/libbsp/i960/cvme961/include/bsp.h @@ -26,6 +26,15 @@ extern "C" { #include #include +/* + * confdefs.h overrides for this BSP: + * - number of termios serial ports (defaults to 1) + * - Interrupt stack space is not minimum if defined. + */ + +/* #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 */ +#define CONFIGURE_INTERRUPT_STACK_MEMORY (4 * 1024) + /* * Define the time limits for RTEMS Test Suite test durations. * Long test and short test duration limits are provided. These diff --git a/c/src/lib/libbsp/i960/cvme961/shmsupp/Makefile.am b/c/src/lib/libbsp/i960/cvme961/shmsupp/Makefile.am index b79ff144a7..f013cd37b0 100644 --- a/c/src/lib/libbsp/i960/cvme961/shmsupp/Makefile.am +++ b/c/src/lib/libbsp/i960/cvme961/shmsupp/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/i960/cvme961/start/Makefile.am b/c/src/lib/libbsp/i960/cvme961/start/Makefile.am index 824d7a22c5..e5a9f26a27 100644 --- a/c/src/lib/libbsp/i960/cvme961/start/Makefile.am +++ b/c/src/lib/libbsp/i960/cvme961/start/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/i960/cvme961/startup/Makefile.am b/c/src/lib/libbsp/i960/cvme961/startup/Makefile.am index fb83483f65..7a31b8edf8 100644 --- a/c/src/lib/libbsp/i960/cvme961/startup/Makefile.am +++ b/c/src/lib/libbsp/i960/cvme961/startup/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/i960/cvme961/startup/bspstart.c b/c/src/lib/libbsp/i960/cvme961/startup/bspstart.c index 26a05670c1..7d89f1c09d 100644 --- a/c/src/lib/libbsp/i960/cvme961/startup/bspstart.c +++ b/c/src/lib/libbsp/i960/cvme961/startup/bspstart.c @@ -107,7 +107,7 @@ void bsp_start( void ) Cpu_table.pretasking_hook = bsp_pretasking_hook; /* init libc, etc. */ Cpu_table.postdriver_hook = bsp_postdriver_hook; - Cpu_table.interrupt_stack_size = 4096; + Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; Cpu_table.Prcb = Prcb; BSP_Configuration.work_space_start = (void *) diff --git a/c/src/lib/libbsp/i960/cvme961/timer/Makefile.am b/c/src/lib/libbsp/i960/cvme961/timer/Makefile.am index c7692ccadc..c85ca86376 100644 --- a/c/src/lib/libbsp/i960/cvme961/timer/Makefile.am +++ b/c/src/lib/libbsp/i960/cvme961/timer/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.am b/c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.am index b2106c290f..01c85b4bbc 100644 --- a/c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.am +++ b/c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.am @@ -1,11 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 -BSP_FILES = startup clock console timer - if HAS_MP GENERIC_MP_REL_FILES = shmdr endif @@ -14,7 +12,7 @@ GENERIC_FILES += $(GENERIC_MP_REL_FILES) if HAS_MP BSP_MP_O_FILES = shmsupp endif -BSP_FILES += $(BSP_MP_O_FILES) +BSP_FILES = startup clock console timer $(BSP_MP_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../../automake/lib.am -- cgit v1.2.3