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/hppa1.1/Makefile.am | 4 ++-- c/src/lib/libbsp/hppa1.1/simhppa/Makefile.am | 4 ++-- c/src/lib/libbsp/hppa1.1/simhppa/include/Makefile.am | 4 ++-- c/src/lib/libbsp/hppa1.1/simhppa/include/bsp.h | 9 +++++++++ c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/Makefile.am | 4 ++-- c/src/lib/libbsp/hppa1.1/simhppa/start/Makefile.am | 4 ++-- c/src/lib/libbsp/hppa1.1/simhppa/startup/Makefile.am | 4 ++-- c/src/lib/libbsp/hppa1.1/simhppa/startup/bspstart.c | 9 +-------- c/src/lib/libbsp/hppa1.1/simhppa/tools/Makefile.am | 6 ++---- c/src/lib/libbsp/hppa1.1/simhppa/tty/Makefile.am | 4 ++-- c/src/lib/libbsp/hppa1.1/simhppa/wrapup/Makefile.am | 7 +++---- 11 files changed, 29 insertions(+), 30 deletions(-) (limited to 'c/src/lib/libbsp/hppa1.1') diff --git a/c/src/lib/libbsp/hppa1.1/Makefile.am b/c/src/lib/libbsp/hppa1.1/Makefile.am index 6e02be9e8e..8515dfe07b 100644 --- a/c/src/lib/libbsp/hppa1.1/Makefile.am +++ b/c/src/lib/libbsp/hppa1.1/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/hppa1.1/simhppa/Makefile.am b/c/src/lib/libbsp/hppa1.1/simhppa/Makefile.am index 932db66253..94c02e2a0e 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/Makefile.am +++ b/c/src/lib/libbsp/hppa1.1/simhppa/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/hppa1.1/simhppa/include/Makefile.am b/c/src/lib/libbsp/hppa1.1/simhppa/include/Makefile.am index da6da12e41..d2abb7f5c7 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/include/Makefile.am +++ b/c/src/lib/libbsp/hppa1.1/simhppa/include/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/include/bsp.h b/c/src/lib/libbsp/hppa1.1/simhppa/include/bsp.h index effeb07cd7..e94e2e36db 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/include/bsp.h +++ b/c/src/lib/libbsp/hppa1.1/simhppa/include/bsp.h @@ -23,6 +23,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 (TBD * 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/hppa1.1/simhppa/shmsupp/Makefile.am b/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/Makefile.am index ff6f7efa21..bef2178809 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/Makefile.am +++ b/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/start/Makefile.am b/c/src/lib/libbsp/hppa1.1/simhppa/start/Makefile.am index 354f02440b..58abb62a6e 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/start/Makefile.am +++ b/c/src/lib/libbsp/hppa1.1/simhppa/start/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/startup/Makefile.am b/c/src/lib/libbsp/hppa1.1/simhppa/startup/Makefile.am index 077121be6b..0666c32432 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/startup/Makefile.am +++ b/c/src/lib/libbsp/hppa1.1/simhppa/startup/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/startup/bspstart.c b/c/src/lib/libbsp/hppa1.1/simhppa/startup/bspstart.c index 96da69993c..cd1ab9c0ee 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/startup/bspstart.c +++ b/c/src/lib/libbsp/hppa1.1/simhppa/startup/bspstart.c @@ -189,7 +189,7 @@ void bsp_start(void) */ Cpu_table.do_zero_of_workspace = FALSE; - Cpu_table.interrupt_stack_size = (12 * 1024); + Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; /* * Set this artificially low for the simulator @@ -230,13 +230,6 @@ void bsp_start(void) BSP_Configuration.maximum_extensions++; #endif - /* - * Add 1 extension for MPCI_fatal - */ - - if (BSP_Configuration.User_multiprocessing_table) - BSP_Configuration.maximum_extensions++; - /* * Set the "clicks per tick" for the simulator * used by libcpu/hppa/clock/clock.c to schedule interrupts diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/tools/Makefile.am b/c/src/lib/libbsp/hppa1.1/simhppa/tools/Makefile.am index e53b867bb8..360cb68d5c 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/tools/Makefile.am +++ b/c/src/lib/libbsp/hppa1.1/simhppa/tools/Makefile.am @@ -5,11 +5,9 @@ AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal -noinst_PROGRAMS= \ -print_dump +noinst_PROGRAMS = print_dump -print_dump_SOURCES= \ -print_dump.c +print_dump_SOURCES = print_dump.c ## HACK: install to build-tree install-exec-local: $(PROGRAMS) diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/tty/Makefile.am b/c/src/lib/libbsp/hppa1.1/simhppa/tty/Makefile.am index b27000a32e..55895d8535 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/tty/Makefile.am +++ b/c/src/lib/libbsp/hppa1.1/simhppa/tty/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/wrapup/Makefile.am b/c/src/lib/libbsp/hppa1.1/simhppa/wrapup/Makefile.am index 5e4a72764b..dbb47fe6db 100644 --- a/c/src/lib/libbsp/hppa1.1/simhppa/wrapup/Makefile.am +++ b/c/src/lib/libbsp/hppa1.1/simhppa/wrapup/Makefile.am @@ -1,10 +1,9 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 -BSP_FILES = startup tty # pieces to pick up out of libcpu/hppa CPU_FILES = clock milli timer @@ -16,7 +15,7 @@ GENERIC_FILES = $(GENERIC_MP_REL_FILES) if HAS_MP BSP_MP_O_FILES = shmsupp endif -BSP_FILES = $(BSP_MP_O_FILES) +BSP_FILES = start tty $(BSP_MP_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../../automake/lib.am -- cgit v1.2.3