diff options
Diffstat (limited to 'c/src/lib/libbsp/m68k/mvme162')
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme162/Makefile.am | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme162/clock/Makefile.am | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme162/console/Makefile.am | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme162/consolex/Makefile.am | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme162/include/Makefile.am | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme162/include/bsp.h | 9 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme162/start/Makefile.am | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme162/startup/Makefile.am | 7 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme162/startup/bspstart.c | 12 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme162/startup/linkcmds | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme162/timer/Makefile.am | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme162/tod/Makefile.am | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme162/tools/Makefile.am | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme162/wrapup/Makefile.am | 8 |
14 files changed, 44 insertions, 30 deletions
diff --git a/c/src/lib/libbsp/m68k/mvme162/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/Makefile.am index 5f68ea75e6..3356a831a1 100644 --- a/c/src/lib/libbsp/m68k/mvme162/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme162/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/mvme162/clock/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/clock/Makefile.am index 0b1ebe8a61..3e08045c00 100644 --- a/c/src/lib/libbsp/m68k/mvme162/clock/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme162/clock/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/m68k/mvme162/console/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/console/Makefile.am index 82b58ef82e..d4e5619fac 100644 --- a/c/src/lib/libbsp/m68k/mvme162/console/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme162/console/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/m68k/mvme162/consolex/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/consolex/Makefile.am index 7214d33b0e..b554eac753 100644 --- a/c/src/lib/libbsp/m68k/mvme162/consolex/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme162/consolex/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/m68k/mvme162/include/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/include/Makefile.am index d1888e75e8..6be4387768 100644 --- a/c/src/lib/libbsp/m68k/mvme162/include/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme162/include/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/m68k/mvme162/include/bsp.h b/c/src/lib/libbsp/m68k/mvme162/include/bsp.h index 68fc8cd634..3314f291f5 100644 --- a/c/src/lib/libbsp/m68k/mvme162/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mvme162/include/bsp.h @@ -32,6 +32,15 @@ extern "C" { #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) + +/* * Following defines must reflect the setup of the particular MVME162 */ diff --git a/c/src/lib/libbsp/m68k/mvme162/start/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/start/Makefile.am index 012c72b1e4..afb2a158f7 100644 --- a/c/src/lib/libbsp/m68k/mvme162/start/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme162/start/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/m68k/mvme162/startup/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/startup/Makefile.am index 3fec4de662..998fb2647a 100644 --- a/c/src/lib/libbsp/m68k/mvme162/startup/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme162/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/mvme162/startup/bspstart.c b/c/src/lib/libbsp/m68k/mvme162/startup/bspstart.c index bd66195bc8..20ccd96dfc 100644 --- a/c/src/lib/libbsp/m68k/mvme162/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/mvme162/startup/bspstart.c @@ -57,9 +57,13 @@ void bsp_pretasking_hook(void); /* m68k version */ void bsp_start( void ) { - m68k_isr_entry *monitors_vector_table; - int index; - extern void *_WorkspaceBase; + m68k_isr_entry *monitors_vector_table; + int index; + extern void *_WorkspaceBase; + extern void *_RamSize; + extern unsigned long _M68k_Ramsize; + + _M68k_Ramsize = (unsigned long)&_RamSize; /* RAM size set in linker script */ /* * 162Bug Vectors are at 0xFFE00000 @@ -102,7 +106,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/mvme162/startup/linkcmds b/c/src/lib/libbsp/m68k/mvme162/startup/linkcmds index 8f8c639790..60a3726f67 100644 --- a/c/src/lib/libbsp/m68k/mvme162/startup/linkcmds +++ b/c/src/lib/libbsp/m68k/mvme162/startup/linkcmds @@ -22,7 +22,7 @@ /* * Declare some sizes. */ -_RamBase = 0x100000; +_RamBase = DEFINED(_RamBase) ? _RamBase : 0x100000; _RamSize = DEFINED(_RamSize) ? _RamSize : 1M; _HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x10000; _StackSize = DEFINED(_StackSize) ? _StackSize : 0x1000; diff --git a/c/src/lib/libbsp/m68k/mvme162/timer/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/timer/Makefile.am index c7692ccadc..c85ca86376 100644 --- a/c/src/lib/libbsp/m68k/mvme162/timer/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme162/timer/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/m68k/mvme162/tod/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/tod/Makefile.am index a21076df11..dd13da9f5c 100644 --- a/c/src/lib/libbsp/m68k/mvme162/tod/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme162/tod/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/m68k/mvme162/tools/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/tools/Makefile.am index ddeb10f584..3eb08bee2d 100644 --- a/c/src/lib/libbsp/m68k/mvme162/tools/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme162/tools/Makefile.am @@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal -noinst_PROGRAMS=sload +noinst_PROGRAMS = sload sload_SOURCES = sload.c @@ -14,4 +14,4 @@ install-exec-local: $(PROGRAMS) $(mkinstalldirs) $(PROJECT_ROOT)/mvme162/bin $(INSTALL_PROGRAM) $(PROGRAMS) $(PROJECT_ROOT)/mvme162/bin -include $(top_srcdir)/../../../../../../../automake/local.am +include $(top_srcdir)/../../../../../../../automake/host.am diff --git a/c/src/lib/libbsp/m68k/mvme162/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/wrapup/Makefile.am index 813d411ac1..57a8214873 100644 --- a/c/src/lib/libbsp/m68k/mvme162/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme162/wrapup/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -9,9 +9,7 @@ BSP_PIECES = startup clock console timer tod # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \ $(wildcard ../consolex/$(ARCH)/consolex.rel) \ - $(wildcard \ - ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/fpsp/$(ARCH)/fpsp.rel) - + $(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/fpsp/$(ARCH)/fpsp.rel) LIB = $(ARCH)/libbsp.a |