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/efi68k/Makefile.am | 4 ++-- c/src/lib/libbsp/m68k/efi68k/clock/Makefile.am | 4 ++-- c/src/lib/libbsp/m68k/efi68k/console/Makefile.am | 4 ++-- c/src/lib/libbsp/m68k/efi68k/include/Makefile.am | 4 ++-- c/src/lib/libbsp/m68k/efi68k/include/bsp.h | 9 +++++++++ c/src/lib/libbsp/m68k/efi68k/spurious/Makefile.am | 4 ++-- c/src/lib/libbsp/m68k/efi68k/start/Makefile.am | 4 ++-- c/src/lib/libbsp/m68k/efi68k/startup/Makefile.am | 7 +++++-- c/src/lib/libbsp/m68k/efi68k/startup/bspstart.c | 8 ++++++-- c/src/lib/libbsp/m68k/efi68k/startup/linkcmds | 5 ++--- c/src/lib/libbsp/m68k/efi68k/timer/Makefile.am | 4 ++-- c/src/lib/libbsp/m68k/efi68k/wrapup/Makefile.am | 4 ++-- 12 files changed, 38 insertions(+), 23 deletions(-) (limited to 'c/src/lib/libbsp/m68k/efi68k') diff --git a/c/src/lib/libbsp/m68k/efi68k/Makefile.am b/c/src/lib/libbsp/m68k/efi68k/Makefile.am index 06ae4c41ab..02af1cbb18 100644 --- a/c/src/lib/libbsp/m68k/efi68k/Makefile.am +++ b/c/src/lib/libbsp/m68k/efi68k/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/efi68k/clock/Makefile.am b/c/src/lib/libbsp/m68k/efi68k/clock/Makefile.am index 0b1ebe8a61..3e08045c00 100644 --- a/c/src/lib/libbsp/m68k/efi68k/clock/Makefile.am +++ b/c/src/lib/libbsp/m68k/efi68k/clock/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/m68k/efi68k/console/Makefile.am b/c/src/lib/libbsp/m68k/efi68k/console/Makefile.am index 82b58ef82e..d4e5619fac 100644 --- a/c/src/lib/libbsp/m68k/efi68k/console/Makefile.am +++ b/c/src/lib/libbsp/m68k/efi68k/console/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/m68k/efi68k/include/Makefile.am b/c/src/lib/libbsp/m68k/efi68k/include/Makefile.am index e3c2a73f91..74f64dafcb 100644 --- a/c/src/lib/libbsp/m68k/efi68k/include/Makefile.am +++ b/c/src/lib/libbsp/m68k/efi68k/include/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/m68k/efi68k/include/bsp.h b/c/src/lib/libbsp/m68k/efi68k/include/bsp.h index b222fa5128..362403d54c 100644 --- a/c/src/lib/libbsp/m68k/efi68k/include/bsp.h +++ b/c/src/lib/libbsp/m68k/efi68k/include/bsp.h @@ -27,6 +27,15 @@ extern "C" { #include #include <16550.h> +/* + * 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/m68k/efi68k/spurious/Makefile.am b/c/src/lib/libbsp/m68k/efi68k/spurious/Makefile.am index b15b542bff..bfd07bd28e 100644 --- a/c/src/lib/libbsp/m68k/efi68k/spurious/Makefile.am +++ b/c/src/lib/libbsp/m68k/efi68k/spurious/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/m68k/efi68k/start/Makefile.am b/c/src/lib/libbsp/m68k/efi68k/start/Makefile.am index 945303e33e..9005137d73 100644 --- a/c/src/lib/libbsp/m68k/efi68k/start/Makefile.am +++ b/c/src/lib/libbsp/m68k/efi68k/start/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/m68k/efi68k/startup/Makefile.am b/c/src/lib/libbsp/m68k/efi68k/startup/Makefile.am index 8b73605c33..32a2ab505a 100644 --- a/c/src/lib/libbsp/m68k/efi68k/startup/Makefile.am +++ b/c/src/lib/libbsp/m68k/efi68k/startup/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -22,6 +22,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/efi68k/startup/bspstart.c b/c/src/lib/libbsp/m68k/efi68k/startup/bspstart.c index 180f3db116..69f57565c1 100644 --- a/c/src/lib/libbsp/m68k/efi68k/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/efi68k/startup/bspstart.c @@ -53,8 +53,12 @@ void bsp_pretasking_hook(void); /* m68k version */ void bsp_start( void ) { - void *vbr; - extern void *_WorkspaceBase; + void *vbr; + extern void *_WorkspaceBase; + extern void *_RamSize; + extern unsigned long _M68k_Ramsize; + + _M68k_Ramsize = (unsigned long)&_RamSize; /* RAM size set in linker script */ /* set_debug_traps(); */ /* breakpoint(); */ diff --git a/c/src/lib/libbsp/m68k/efi68k/startup/linkcmds b/c/src/lib/libbsp/m68k/efi68k/startup/linkcmds index c174c3f4c8..4830c948d7 100644 --- a/c/src/lib/libbsp/m68k/efi68k/startup/linkcmds +++ b/c/src/lib/libbsp/m68k/efi68k/startup/linkcmds @@ -42,9 +42,6 @@ MEMORY ram : ORIGIN = 0x203000, LENGTH = 256K } -_RamBase = 0x200000; -_RamSize = 256K; - _VBR = 0x200000; /* location of the VBR table (in RAM) */ __end_of_ram = 0x240000; _copy_data_from_rom = 0; @@ -52,6 +49,8 @@ _copy_data_from_rom = 0; /* * Declare some sizes. */ +_RamBase = DEFINED(_RamBase) ? _RamBase : 0x200000; +_RamSize = DEFINED(_RamSize) ? _RamSize : 256K; _HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x10000; _StackSize = DEFINED(_StackSize) ? _StackSize : 0x1000; diff --git a/c/src/lib/libbsp/m68k/efi68k/timer/Makefile.am b/c/src/lib/libbsp/m68k/efi68k/timer/Makefile.am index 7f16dcc233..5c2b8edf56 100644 --- a/c/src/lib/libbsp/m68k/efi68k/timer/Makefile.am +++ b/c/src/lib/libbsp/m68k/efi68k/timer/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/m68k/efi68k/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/efi68k/wrapup/Makefile.am index 192820440e..5b82482da1 100644 --- a/c/src/lib/libbsp/m68k/efi68k/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/efi68k/wrapup/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 -- cgit v1.2.3