diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-06-12 15:00:15 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-06-12 15:00:15 +0000 |
commit | df49c60c9671e4a28e636964d744c1f59fb6cb68 (patch) | |
tree | eabd85e189514ad412a35414ba5d483dcda3ef1f /c/src/lib/libbsp/m68k/mvme147s | |
parent | Purged as many egcs references as possible. (diff) | |
download | rtems-df49c60c9671e4a28e636964d744c1f59fb6cb68.tar.bz2 |
Merged from 4.5.0-beta3a
Diffstat (limited to 'c/src/lib/libbsp/m68k/mvme147s')
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme147s/Makefile.am | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme147s/clock/Makefile.am | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme147s/console/Makefile.am | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme147s/include/Makefile.am | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme147s/include/bsp.h | 9 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme147s/shmsupp/Makefile.am | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme147s/start/Makefile.am | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme147s/startup/Makefile.am | 10 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme147s/startup/bspstart.c | 14 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme147s/startup/linkcmds | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme147s/timer/Makefile.am | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.am | 8 |
12 files changed, 42 insertions, 29 deletions
diff --git a/c/src/lib/libbsp/m68k/mvme147s/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/Makefile.am index 91691039af..8a6b3dd869 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147s/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/mvme147s/clock/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/clock/Makefile.am index b0ab78c06d..11c7977842 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/clock/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147s/clock/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/m68k/mvme147s/console/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/console/Makefile.am index 985a394056..2c2152a8b8 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/console/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147s/console/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/m68k/mvme147s/include/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/include/Makefile.am index 091727637a..2b8181354c 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/include/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147s/include/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/m68k/mvme147s/include/bsp.h b/c/src/lib/libbsp/m68k/mvme147s/include/bsp.h index 3a7d84e73a..c492535433 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mvme147s/include/bsp.h @@ -28,6 +28,15 @@ extern "C" { #include <console.h> #include <iosupp.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 (4 * 1024) + /* Constants */ #define RAM_START 0x00007000 diff --git a/c/src/lib/libbsp/m68k/mvme147s/shmsupp/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/shmsupp/Makefile.am index e115697f7e..8965374ec1 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/shmsupp/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147s/shmsupp/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/m68k/mvme147s/start/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/start/Makefile.am index 012c72b1e4..afb2a158f7 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/start/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147s/start/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/m68k/mvme147s/startup/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/startup/Makefile.am index 6462e153e7..12a12de408 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/startup/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147s/startup/Makefile.am @@ -1,11 +1,10 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 -VPATH = \ - @srcdir@:@srcdir@/../../mvme147/startup:@srcdir@/../../shared:@srcdir@/../../../shared +VPATH = @srcdir@:@srcdir@/../../mvme147/startup:@srcdir@/../../shared:@srcdir@/../../../shared PGM = $(ARCH)/startup.rel @@ -22,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/mvme147s/startup/bspstart.c b/c/src/lib/libbsp/m68k/mvme147s/startup/bspstart.c index aa1b6c61ca..9306768e5c 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/mvme147s/startup/bspstart.c @@ -53,10 +53,14 @@ void bsp_pretasking_hook(void); /* m68k version */ void bsp_start( void ) { - m68k_isr_entry *monitors_vector_table; - int index; - rtems_unsigned8 node_number; - extern void *_WorkspaceBase; + m68k_isr_entry *monitors_vector_table; + int index; + rtems_unsigned8 node_number; + 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; /* 147Bug Vectors are at 0 */ m68k_set_vbr( monitors_vector_table ); @@ -144,7 +148,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/mvme147s/startup/linkcmds b/c/src/lib/libbsp/m68k/mvme147s/startup/linkcmds index e752b5b33e..41d26d7508 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/startup/linkcmds +++ b/c/src/lib/libbsp/m68k/mvme147s/startup/linkcmds @@ -19,7 +19,7 @@ /* * Declare some sizes. */ -_RamBase = 0x0; +_RamBase = DEFINED(_RamBase) ? _RamBase : 0x0; _RamSize = DEFINED(_RamSize) ? _RamSize : 4M; _HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x10000; _StackSize = DEFINED(_StackSize) ? _StackSize : 0x1000; diff --git a/c/src/lib/libbsp/m68k/mvme147s/timer/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/timer/Makefile.am index 53db3601a9..624d07fcf5 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/timer/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147s/timer/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.am index 2152d8ec39..e3dd06fc1e 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147s/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)) \ |