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/m68k/mvme136/Makefile.am | 4 ++-- c/src/lib/libbsp/m68k/mvme136/clock/Makefile.am | 4 ++-- c/src/lib/libbsp/m68k/mvme136/console/Makefile.am | 4 ++-- c/src/lib/libbsp/m68k/mvme136/include/Makefile.am | 4 ++-- c/src/lib/libbsp/m68k/mvme136/include/bsp.h | 9 +++++++++ c/src/lib/libbsp/m68k/mvme136/shmsupp/Makefile.am | 4 ++-- c/src/lib/libbsp/m68k/mvme136/start/Makefile.am | 4 ++-- c/src/lib/libbsp/m68k/mvme136/startup/Makefile.am | 7 +++++-- c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c | 8 ++++++-- c/src/lib/libbsp/m68k/mvme136/startup/linkcmds | 2 +- c/src/lib/libbsp/m68k/mvme136/timer/Makefile.am | 4 ++-- c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.am | 8 +++----- 12 files changed, 38 insertions(+), 24 deletions(-) (limited to 'c/src/lib/libbsp/m68k/mvme136') diff --git a/c/src/lib/libbsp/m68k/mvme136/Makefile.am b/c/src/lib/libbsp/m68k/mvme136/Makefile.am index f487dfdedd..1ed23823a9 100644 --- a/c/src/lib/libbsp/m68k/mvme136/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme136/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/m68k/mvme136/clock/Makefile.am b/c/src/lib/libbsp/m68k/mvme136/clock/Makefile.am index 0b1ebe8a61..3e08045c00 100644 --- a/c/src/lib/libbsp/m68k/mvme136/clock/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme136/clock/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/m68k/mvme136/console/Makefile.am b/c/src/lib/libbsp/m68k/mvme136/console/Makefile.am index 82b58ef82e..d4e5619fac 100644 --- a/c/src/lib/libbsp/m68k/mvme136/console/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme136/console/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/m68k/mvme136/include/Makefile.am b/c/src/lib/libbsp/m68k/mvme136/include/Makefile.am index 091727637a..2b8181354c 100644 --- a/c/src/lib/libbsp/m68k/mvme136/include/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme136/include/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/m68k/mvme136/include/bsp.h b/c/src/lib/libbsp/m68k/mvme136/include/bsp.h index 02405dff46..9584b24eb7 100644 --- a/c/src/lib/libbsp/m68k/mvme136/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mvme136/include/bsp.h @@ -24,6 +24,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/m68k/mvme136/shmsupp/Makefile.am b/c/src/lib/libbsp/m68k/mvme136/shmsupp/Makefile.am index e115697f7e..8965374ec1 100644 --- a/c/src/lib/libbsp/m68k/mvme136/shmsupp/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme136/shmsupp/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/m68k/mvme136/start/Makefile.am b/c/src/lib/libbsp/m68k/mvme136/start/Makefile.am index 012c72b1e4..afb2a158f7 100644 --- a/c/src/lib/libbsp/m68k/mvme136/start/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme136/start/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/m68k/mvme136/startup/Makefile.am b/c/src/lib/libbsp/m68k/mvme136/startup/Makefile.am index 52352e3b7b..df42506bbb 100644 --- a/c/src/lib/libbsp/m68k/mvme136/startup/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme136/startup/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -21,6 +21,9 @@ include $(top_srcdir)/../../../../../../automake/lib.am # (OPTIONAL) Add local stuff here using += # +# USE_INIT_FINI tells main.c what C++ help we need. +AM_CPPFLAGS += -DUSE_INIT_FINI + $(PGM): $(OBJS) $(make-rel) diff --git a/c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c b/c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c index 79089b356c..9818739c0f 100644 --- a/c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c @@ -52,7 +52,11 @@ void bsp_start( void ) { m68k_isr_entry *monitors_vector_table; int index; - extern void *_WorkspaceBase; + extern void *_WorkspaceBase; + extern void *_RamSize; + extern unsigned long _M68k_Ramsize; + + _M68k_Ramsize = (unsigned long)&_RamSize; /* RAM size set in linker script */ monitors_vector_table = (m68k_isr_entry *)0; /* 135Bug Vectors are at 0 */ m68k_set_vbr( monitors_vector_table ); @@ -78,7 +82,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_vector_table = (m68k_isr_entry *) &M68Kvec; - Cpu_table.interrupt_stack_size = 4096; + Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; BSP_Configuration.work_space_start = (void *) &_WorkspaceBase; } diff --git a/c/src/lib/libbsp/m68k/mvme136/startup/linkcmds b/c/src/lib/libbsp/m68k/mvme136/startup/linkcmds index 67101dcd32..8aec416acb 100644 --- a/c/src/lib/libbsp/m68k/mvme136/startup/linkcmds +++ b/c/src/lib/libbsp/m68k/mvme136/startup/linkcmds @@ -15,7 +15,7 @@ /* * Declare some sizes. */ -_RamBase = 0x0; +_RamBase = DEFINED(_RamBase) ? _RamBase : 0x0; _RamSize = DEFINED(_RamSize) ? _RamSize : 1M; _HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x10000; _StackSize = DEFINED(_StackSize) ? _StackSize : 0x1000; diff --git a/c/src/lib/libbsp/m68k/mvme136/timer/Makefile.am b/c/src/lib/libbsp/m68k/mvme136/timer/Makefile.am index c7692ccadc..c85ca86376 100644 --- a/c/src/lib/libbsp/m68k/mvme136/timer/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme136/timer/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.am index 2152d8ec39..e3dd06fc1e 100644 --- a/c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.am @@ -1,14 +1,12 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../../automake/lib.am -BSP_PIECES = startup clock console timer - if HAS_MP GENERIC_MP_REL_PIECES = shmdr endif @@ -17,7 +15,7 @@ GENERIC_PIECES += $(GENERIC_MP_REL_PIECES) if HAS_MP BSP_MP_O_PIECES = shmsupp endif -BSP_PIECES += $(BSP_MP_O_PIECES) +BSP_PIECES = startup clock console timer $(BSP_MP_O_PIECES) # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \ -- cgit v1.2.3