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/no_cpu/Makefile.am | 4 ++-- c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am | 4 ++-- c/src/lib/libbsp/no_cpu/no_bsp/clock/Makefile.am | 4 ++-- c/src/lib/libbsp/no_cpu/no_bsp/console/Makefile.am | 4 ++-- c/src/lib/libbsp/no_cpu/no_bsp/include/Makefile.am | 4 ++-- c/src/lib/libbsp/no_cpu/no_bsp/include/bsp.h | 9 +++++++++ c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/Makefile.am | 4 ++-- c/src/lib/libbsp/no_cpu/no_bsp/startup/Makefile.am | 4 ++-- c/src/lib/libbsp/no_cpu/no_bsp/startup/bspstart.c | 2 +- c/src/lib/libbsp/no_cpu/no_bsp/timer/Makefile.am | 4 ++-- c/src/lib/libbsp/no_cpu/no_bsp/wrapup/Makefile.am | 8 +++----- 11 files changed, 29 insertions(+), 22 deletions(-) (limited to 'c/src/lib/libbsp/no_cpu') diff --git a/c/src/lib/libbsp/no_cpu/Makefile.am b/c/src/lib/libbsp/no_cpu/Makefile.am index 6e02be9e8e..8515dfe07b 100644 --- a/c/src/lib/libbsp/no_cpu/Makefile.am +++ b/c/src/lib/libbsp/no_cpu/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/no_cpu/no_bsp/Makefile.am b/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am index b484f3426f..a49dd752a7 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am +++ b/c/src/lib/libbsp/no_cpu/no_bsp/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/no_cpu/no_bsp/clock/Makefile.am b/c/src/lib/libbsp/no_cpu/no_bsp/clock/Makefile.am index 0b1ebe8a61..3e08045c00 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/clock/Makefile.am +++ b/c/src/lib/libbsp/no_cpu/no_bsp/clock/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/console/Makefile.am b/c/src/lib/libbsp/no_cpu/no_bsp/console/Makefile.am index 82b58ef82e..d4e5619fac 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/console/Makefile.am +++ b/c/src/lib/libbsp/no_cpu/no_bsp/console/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/include/Makefile.am b/c/src/lib/libbsp/no_cpu/no_bsp/include/Makefile.am index a97b688f4f..96bbbc3c69 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/include/Makefile.am +++ b/c/src/lib/libbsp/no_cpu/no_bsp/include/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/include/bsp.h b/c/src/lib/libbsp/no_cpu/no_bsp/include/bsp.h index 8047f5a291..3f8150e42e 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/include/bsp.h +++ b/c/src/lib/libbsp/no_cpu/no_bsp/include/bsp.h @@ -25,6 +25,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/no_cpu/no_bsp/shmsupp/Makefile.am b/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/Makefile.am index 9bf07cebd4..703b62caed 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/Makefile.am +++ b/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/startup/Makefile.am b/c/src/lib/libbsp/no_cpu/no_bsp/startup/Makefile.am index 2b0174264f..d5509c6d67 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/startup/Makefile.am +++ b/c/src/lib/libbsp/no_cpu/no_bsp/startup/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/startup/bspstart.c b/c/src/lib/libbsp/no_cpu/no_bsp/startup/bspstart.c index a6e63372d5..249236036f 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/startup/bspstart.c +++ b/c/src/lib/libbsp/no_cpu/no_bsp/startup/bspstart.c @@ -101,5 +101,5 @@ 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; } diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/timer/Makefile.am b/c/src/lib/libbsp/no_cpu/no_bsp/timer/Makefile.am index e07e5caa10..c2391d3605 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/timer/Makefile.am +++ b/c/src/lib/libbsp/no_cpu/no_bsp/timer/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/wrapup/Makefile.am b/c/src/lib/libbsp/no_cpu/no_bsp/wrapup/Makefile.am index 8d9f683f77..ca92b1d212 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/wrapup/Makefile.am +++ b/c/src/lib/libbsp/no_cpu/no_bsp/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) # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_FILES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \ -- cgit v1.2.3