13 files changed, 46 insertions, 35 deletions
diff --git a/c/src/lib/libbsp/m68k/dmv152/Makefile.am b/c/src/lib/libbsp/m68k/dmv152/Makefile.am
index 06ae4c41ab..02af1cbb18 100644
--- a/c/src/lib/libbsp/m68k/dmv152/Makefile.am
+++ b/c/src/lib/libbsp/m68k/dmv152/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/dmv152/clock/Makefile.am b/c/src/lib/libbsp/m68k/dmv152/clock/Makefile.am
index 0b1ebe8a61..3e08045c00 100644
--- a/c/src/lib/libbsp/m68k/dmv152/clock/Makefile.am
+++ b/c/src/lib/libbsp/m68k/dmv152/clock/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
diff --git a/c/src/lib/libbsp/m68k/dmv152/console/Makefile.am b/c/src/lib/libbsp/m68k/dmv152/console/Makefile.am
index 82b58ef82e..d4e5619fac 100644
--- a/c/src/lib/libbsp/m68k/dmv152/console/Makefile.am
+++ b/c/src/lib/libbsp/m68k/dmv152/console/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
diff --git a/c/src/lib/libbsp/m68k/dmv152/console/console.c b/c/src/lib/libbsp/m68k/dmv152/console/console.c
index 0327a6ddbd..2f8d482007 100644
--- a/c/src/lib/libbsp/m68k/dmv152/console/console.c
+++ b/c/src/lib/libbsp/m68k/dmv152/console/console.c
@@ -128,13 +128,6 @@ int console_write_support (int minor, const char *buf, int len)
   return nwrite;
 }
 
-void console_reserve_resources(
-  rtems_configuration_table *configuration
-)
-{
-  rtems_termios_reserve_resources( configuration, 2 );
-}
-
 /*
  *  Console Device Driver Entry Points
  *
diff --git a/c/src/lib/libbsp/m68k/dmv152/include/Makefile.am b/c/src/lib/libbsp/m68k/dmv152/include/Makefile.am
index 091727637a..2b8181354c 100644
--- a/c/src/lib/libbsp/m68k/dmv152/include/Makefile.am
+++ b/c/src/lib/libbsp/m68k/dmv152/include/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
diff --git a/c/src/lib/libbsp/m68k/dmv152/include/bsp.h b/c/src/lib/libbsp/m68k/dmv152/include/bsp.h
index 20b711b461..bfb1f4d2d9 100644
--- a/c/src/lib/libbsp/m68k/dmv152/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/dmv152/include/bsp.h
@@ -28,6 +28,24 @@ extern "C" {
 #include <zilog/z8536.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)
+
+/*
+ *  confdefs.h overrides for this BSP:
+ *   - 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
  *  values are in seconds and need to be converted to ticks for the
diff --git a/c/src/lib/libbsp/m68k/dmv152/spurious/Makefile.am b/c/src/lib/libbsp/m68k/dmv152/spurious/Makefile.am
index b15b542bff..bfd07bd28e 100644
--- a/c/src/lib/libbsp/m68k/dmv152/spurious/Makefile.am
+++ b/c/src/lib/libbsp/m68k/dmv152/spurious/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
diff --git a/c/src/lib/libbsp/m68k/dmv152/start/Makefile.am b/c/src/lib/libbsp/m68k/dmv152/start/Makefile.am
index 012c72b1e4..afb2a158f7 100644
--- a/c/src/lib/libbsp/m68k/dmv152/start/Makefile.am
+++ b/c/src/lib/libbsp/m68k/dmv152/start/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
diff --git a/c/src/lib/libbsp/m68k/dmv152/startup/Makefile.am b/c/src/lib/libbsp/m68k/dmv152/startup/Makefile.am
index 202c1ce798..ea99713294 100644
--- a/c/src/lib/libbsp/m68k/dmv152/startup/Makefile.am
+++ b/c/src/lib/libbsp/m68k/dmv152/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/dmv152/startup/bspstart.c b/c/src/lib/libbsp/m68k/dmv152/startup/bspstart.c
index 90f171ef0a..8f4b3118b6 100644
--- a/c/src/lib/libbsp/m68k/dmv152/startup/bspstart.c
+++ b/c/src/lib/libbsp/m68k/dmv152/startup/bspstart.c
@@ -53,6 +53,10 @@ void bsp_start( void )
   int             index;
   void           *vbr;
   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;   /* Monitor Vectors are at 0 */
   m68k_set_vbr( monitors_vector_table );
@@ -89,18 +93,12 @@ void bsp_start( void )
   Cpu_table.pretasking_hook = bsp_pretasking_hook;  /* init libc, etc. */
   Cpu_table.postdriver_hook = bsp_postdriver_hook;
   Cpu_table.do_zero_of_workspace = TRUE;
-  Cpu_table.interrupt_stack_size = 4096;
+  Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY;
 
   m68k_get_vbr( vbr );
   Cpu_table.interrupt_vector_table = vbr;
 
   BSP_Configuration.work_space_start = (void *) &_WorkspaceBase;
 
-  /*
-   *  Account for the console's resources
-   */
-
-  console_reserve_resources( &BSP_Configuration );
-
   /* Clock_exit is done as an atexit() function */
 }
diff --git a/c/src/lib/libbsp/m68k/dmv152/startup/linkcmds b/c/src/lib/libbsp/m68k/dmv152/startup/linkcmds
index 7f92758e77..8edc69ee94 100644
--- a/c/src/lib/libbsp/m68k/dmv152/startup/linkcmds
+++ b/c/src/lib/libbsp/m68k/dmv152/startup/linkcmds
@@ -15,6 +15,8 @@
 /*
  * Declare some sizes.
  */
+_RamBase = DEFINED(_RamBase) ? _RamBase : 0x0;
+_RamSize = DEFINED(_RamSize) ? _RamSize : 1M;
 _HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x10000;
 _StackSize = DEFINED(_StackSize) ? _StackSize : 0x1000;
 
@@ -23,9 +25,6 @@ MEMORY
 	ram : org = 0x0, l = 1M
 }
 
-_RamBase = 0;
-_RamSize = 1M;
-
 SECTIONS
 {
 	ram : {
diff --git a/c/src/lib/libbsp/m68k/dmv152/timer/Makefile.am b/c/src/lib/libbsp/m68k/dmv152/timer/Makefile.am
index c7692ccadc..c85ca86376 100644
--- a/c/src/lib/libbsp/m68k/dmv152/timer/Makefile.am
+++ b/c/src/lib/libbsp/m68k/dmv152/timer/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
diff --git a/c/src/lib/libbsp/m68k/dmv152/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/dmv152/wrapup/Makefile.am
index 192820440e..5b82482da1 100644
--- a/c/src/lib/libbsp/m68k/dmv152/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/m68k/dmv152/wrapup/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4