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/i386/i386ex/Makefile.am | 4 ++-- c/src/lib/libbsp/i386/i386ex/clock/Makefile.am | 6 +++--- c/src/lib/libbsp/i386/i386ex/console/Makefile.am | 6 +++--- c/src/lib/libbsp/i386/i386ex/console/console.c | 6 ------ c/src/lib/libbsp/i386/i386ex/include/Makefile.am | 4 ++-- c/src/lib/libbsp/i386/i386ex/include/bsp.h | 9 +++++++++ c/src/lib/libbsp/i386/i386ex/network/Makefile.am | 4 ++-- c/src/lib/libbsp/i386/i386ex/start/Makefile.am | 4 ++-- c/src/lib/libbsp/i386/i386ex/start/start.S | 4 ++-- c/src/lib/libbsp/i386/i386ex/startup/Makefile.am | 4 ++-- c/src/lib/libbsp/i386/i386ex/startup/bspstart.c | 6 ++---- c/src/lib/libbsp/i386/i386ex/timer/Makefile.am | 6 +++--- c/src/lib/libbsp/i386/i386ex/wrapup/Makefile.am | 4 ++-- 13 files changed, 34 insertions(+), 33 deletions(-) (limited to 'c/src/lib/libbsp/i386/i386ex') diff --git a/c/src/lib/libbsp/i386/i386ex/Makefile.am b/c/src/lib/libbsp/i386/i386ex/Makefile.am index 0bc7c07a45..153fe29c17 100644 --- a/c/src/lib/libbsp/i386/i386ex/Makefile.am +++ b/c/src/lib/libbsp/i386/i386ex/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/i386/i386ex/clock/Makefile.am b/c/src/lib/libbsp/i386/i386ex/clock/Makefile.am index 016b81894f..1c5f03eaf5 100644 --- a/c/src/lib/libbsp/i386/i386ex/clock/Makefile.am +++ b/c/src/lib/libbsp/i386/i386ex/clock/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -19,7 +19,7 @@ include $(top_srcdir)/../../../../../../automake/lib.am $(PGM): $(clock_rel_OBJECTS) $(make-rel) -# the .rel file built here will be put into libbsp.a by +# the .rel file built here will be put into libbsp.a by # ../wrapup/Makefile all-local: $(ARCH) $(clock_rel_OBJECTS) $(PGM) diff --git a/c/src/lib/libbsp/i386/i386ex/console/Makefile.am b/c/src/lib/libbsp/i386/i386ex/console/Makefile.am index 13810f58b0..4b0c14dbdc 100644 --- a/c/src/lib/libbsp/i386/i386ex/console/Makefile.am +++ b/c/src/lib/libbsp/i386/i386ex/console/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -23,7 +23,7 @@ include $(top_srcdir)/../../../../../../automake/lib.am $(PGM): $(console_rel_OBJECTS) $(make-rel) -# the .rel file built here will be put into libbsp.a by +# the .rel file built here will be put into libbsp.a by # ../wrapup/Makefile all-local: $(ARCH) $(console_rel_OBJECTS) $(PGM) diff --git a/c/src/lib/libbsp/i386/i386ex/console/console.c b/c/src/lib/libbsp/i386/i386ex/console/console.c index 821c2e4c34..d8082ddd74 100644 --- a/c/src/lib/libbsp/i386/i386ex/console/console.c +++ b/c/src/lib/libbsp/i386/i386ex/console/console.c @@ -95,12 +95,6 @@ isr_is_on(const rtems_irq_connect_data *irq) return BSP_irq_enabled_at_i8259s(irq->name); } -void console_reserve_resources(rtems_configuration_table *conf) -{ - rtems_termios_reserve_resources(conf, 1); - return; -} - void __assert (const char *file, int line, const char *msg) { static char exit_msg[] = "EXECUTIVE SHUTDOWN! Any key to reboot..."; diff --git a/c/src/lib/libbsp/i386/i386ex/include/Makefile.am b/c/src/lib/libbsp/i386/i386ex/include/Makefile.am index 43cf28d6c2..3f061aa216 100644 --- a/c/src/lib/libbsp/i386/i386ex/include/Makefile.am +++ b/c/src/lib/libbsp/i386/i386ex/include/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/i386/i386ex/include/bsp.h b/c/src/lib/libbsp/i386/i386ex/include/bsp.h index 7a812e9d5b..991badd5c5 100644 --- a/c/src/lib/libbsp/i386/i386ex/include/bsp.h +++ b/c/src/lib/libbsp/i386/i386ex/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 (8 * 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/i386/i386ex/network/Makefile.am b/c/src/lib/libbsp/i386/i386ex/network/Makefile.am index 622d9ccfb3..d0e6c20966 100644 --- a/c/src/lib/libbsp/i386/i386ex/network/Makefile.am +++ b/c/src/lib/libbsp/i386/i386ex/network/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/i386/i386ex/start/Makefile.am b/c/src/lib/libbsp/i386/i386ex/start/Makefile.am index 00e98eb654..e8514e5c0c 100644 --- a/c/src/lib/libbsp/i386/i386ex/start/Makefile.am +++ b/c/src/lib/libbsp/i386/i386ex/start/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/i386/i386ex/start/start.S b/c/src/lib/libbsp/i386/i386ex/start/start.S index 80f7b8cdf1..c3a8564c9c 100644 --- a/c/src/lib/libbsp/i386/i386ex/start/start.S +++ b/c/src/lib/libbsp/i386/i386ex/start/start.S @@ -83,7 +83,7 @@ END_DATA */ .code16 - .section .reset + .section .reset, "ax" PUBLIC ( SYM(reset) ) SYM(reset): nop @@ -106,7 +106,7 @@ SYM(reset): nop nop - .section .initial + .section .initial, "ax" /* nop */ /* required for linker -- initial jump is to "label - 2" */ /* nop */ /* ie. _initInternalRegisters -2 ( which now == .initial ) */ /* diff --git a/c/src/lib/libbsp/i386/i386ex/startup/Makefile.am b/c/src/lib/libbsp/i386/i386ex/startup/Makefile.am index b6bff49c66..c351417051 100644 --- a/c/src/lib/libbsp/i386/i386ex/startup/Makefile.am +++ b/c/src/lib/libbsp/i386/i386ex/startup/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/i386/i386ex/startup/bspstart.c b/c/src/lib/libbsp/i386/i386ex/startup/bspstart.c index c6dfe741cb..0f9f5dea51 100644 --- a/c/src/lib/libbsp/i386/i386ex/startup/bspstart.c +++ b/c/src/lib/libbsp/i386/i386ex/startup/bspstart.c @@ -102,14 +102,13 @@ void bsp_start( void ) Cpu_table.postdriver_hook = bsp_postdriver_hook; Cpu_table.interrupt_table_segment = get_ds(); Cpu_table.interrupt_table_offset = (void *)Interrupt_descriptor_table; - Cpu_table.interrupt_stack_size = 8192; /* changed Sept 14 STACK_MINIMUM_SIZE */ + /* changed Sept 14 STACK_MINIMUM_SIZE */ + Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; #if defined(RTEMS_POSIX_API) BSP_Configuration.work_space_size *= 3; #endif - /* BSP_Configuration.work_space_size += 128 * RTEMS_MINIMUM_STACK_SIZE; */ - BSP_Configuration.work_space_start = (void *) RAM_END - BSP_Configuration.work_space_size; #ifdef DEBUG @@ -120,7 +119,6 @@ void bsp_start( void ) * Account for the console's resources */ - /* console_reserve_resources( &BSP_Configuration ); */ /* * Init rtems_interrupt_management */ diff --git a/c/src/lib/libbsp/i386/i386ex/timer/Makefile.am b/c/src/lib/libbsp/i386/i386ex/timer/Makefile.am index 5e87c956a3..df08f6e87d 100644 --- a/c/src/lib/libbsp/i386/i386ex/timer/Makefile.am +++ b/c/src/lib/libbsp/i386/i386ex/timer/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -20,7 +20,7 @@ include $(top_srcdir)/../../../../../../automake/lib.am $(PGM): $(timer_rel_OBJECTS) $(make-rel) -# the .rel file built here will be put into libbsp.a by +# the .rel file built here will be put into libbsp.a by # ../wrapup/Makefile all-local: $(ARCH) $(timer_rel_OBJECTS) $(PGM) diff --git a/c/src/lib/libbsp/i386/i386ex/wrapup/Makefile.am b/c/src/lib/libbsp/i386/i386ex/wrapup/Makefile.am index 54941a5a93..0c3d7fa39c 100644 --- a/c/src/lib/libbsp/i386/i386ex/wrapup/Makefile.am +++ b/c/src/lib/libbsp/i386/i386ex/wrapup/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 -- cgit v1.2.3