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/gen68302/Makefile.am | 4 ++-- c/src/lib/libbsp/m68k/gen68302/clock/Makefile.am | 4 ++-- c/src/lib/libbsp/m68k/gen68302/console/Makefile.am | 4 ++-- c/src/lib/libbsp/m68k/gen68302/include/Makefile.am | 4 ++-- c/src/lib/libbsp/m68k/gen68302/include/bsp.h | 9 +++++++++ c/src/lib/libbsp/m68k/gen68302/start/Makefile.am | 4 ++-- c/src/lib/libbsp/m68k/gen68302/startup/Makefile.am | 7 +++++-- c/src/lib/libbsp/m68k/gen68302/startup/bspstart.c | 9 +++++++-- c/src/lib/libbsp/m68k/gen68302/startup/linkcmds | 5 ++--- c/src/lib/libbsp/m68k/gen68302/timer/Makefile.am | 4 ++-- c/src/lib/libbsp/m68k/gen68302/wrapup/Makefile.am | 4 ++-- 11 files changed, 37 insertions(+), 21 deletions(-) (limited to 'c/src/lib/libbsp/m68k/gen68302') diff --git a/c/src/lib/libbsp/m68k/gen68302/Makefile.am b/c/src/lib/libbsp/m68k/gen68302/Makefile.am index 487cec1fb5..06d6ecdaeb 100644 --- a/c/src/lib/libbsp/m68k/gen68302/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68302/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/gen68302/clock/Makefile.am b/c/src/lib/libbsp/m68k/gen68302/clock/Makefile.am index 0b1ebe8a61..3e08045c00 100644 --- a/c/src/lib/libbsp/m68k/gen68302/clock/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68302/clock/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/m68k/gen68302/console/Makefile.am b/c/src/lib/libbsp/m68k/gen68302/console/Makefile.am index 82b58ef82e..d4e5619fac 100644 --- a/c/src/lib/libbsp/m68k/gen68302/console/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68302/console/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/m68k/gen68302/include/Makefile.am b/c/src/lib/libbsp/m68k/gen68302/include/Makefile.am index 091727637a..2b8181354c 100644 --- a/c/src/lib/libbsp/m68k/gen68302/include/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68302/include/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/m68k/gen68302/include/bsp.h b/c/src/lib/libbsp/m68k/gen68302/include/bsp.h index 10878fe165..0ea40ecb8b 100644 --- a/c/src/lib/libbsp/m68k/gen68302/include/bsp.h +++ b/c/src/lib/libbsp/m68k/gen68302/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/m68k/gen68302/start/Makefile.am b/c/src/lib/libbsp/m68k/gen68302/start/Makefile.am index 824d7a22c5..e5a9f26a27 100644 --- a/c/src/lib/libbsp/m68k/gen68302/start/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68302/start/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/m68k/gen68302/startup/Makefile.am b/c/src/lib/libbsp/m68k/gen68302/startup/Makefile.am index 52352e3b7b..df42506bbb 100644 --- a/c/src/lib/libbsp/m68k/gen68302/startup/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68302/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/gen68302/startup/bspstart.c b/c/src/lib/libbsp/m68k/gen68302/startup/bspstart.c index a33ef2bbf8..50dae413e1 100644 --- a/c/src/lib/libbsp/m68k/gen68302/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/gen68302/startup/bspstart.c @@ -49,7 +49,12 @@ void bsp_pretasking_hook(void); /* m68k version */ void bsp_start( void ) { - extern void *_WorkspaceBase; + extern void *_WorkspaceBase; + extern void *_RamSize; + extern void *_RamSize; + extern unsigned long _M68k_Ramsize; + + _M68k_Ramsize = (unsigned long)&_RamSize; /* RAM size set in linker script */ /* * Allocate the memory for the RTEMS Work Space. This can come from @@ -76,5 +81,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/m68k/gen68302/startup/linkcmds b/c/src/lib/libbsp/m68k/gen68302/startup/linkcmds index 99d0f27cac..64bbcad42f 100644 --- a/c/src/lib/libbsp/m68k/gen68302/startup/linkcmds +++ b/c/src/lib/libbsp/m68k/gen68302/startup/linkcmds @@ -17,15 +17,14 @@ MEMORY ram : org = 0x0000, l = 16M } -_RamBase = 0; -_RamSize = 16M; - m302 = 0xf7f000; _VBR = 0x000000; /* location of the VBR table (in RAM) */ /* * Declare some sizes. */ +_RamBase = DEFINED(_RamBase) ? _RamBase : 0x0; +_RamSize = DEFINED(_RamSize) ? _RamSize : 16M; _HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x10000; _StackSize = DEFINED(_StackSize) ? _StackSize : 0x1000; diff --git a/c/src/lib/libbsp/m68k/gen68302/timer/Makefile.am b/c/src/lib/libbsp/m68k/gen68302/timer/Makefile.am index c7692ccadc..c85ca86376 100644 --- a/c/src/lib/libbsp/m68k/gen68302/timer/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68302/timer/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/m68k/gen68302/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/gen68302/wrapup/Makefile.am index 0a9f963995..cd855d70eb 100644 --- a/c/src/lib/libbsp/m68k/gen68302/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68302/wrapup/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 -- cgit v1.2.3