From df49c60c9671e4a28e636964d744c1f59fb6cb68 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Mon, 12 Jun 2000 15:00:15 +0000
Subject: Merged from 4.5.0-beta3a

---
 c/src/lib/libbsp/m68k/gen68340/startup/Makefile.am |  7 +++++--
 c/src/lib/libbsp/m68k/gen68340/startup/bspstart.c  | 14 ++++++--------
 c/src/lib/libbsp/m68k/gen68340/startup/linkcmds    |  2 +-
 3 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'c/src/lib/libbsp/m68k/gen68340/startup')

diff --git a/c/src/lib/libbsp/m68k/gen68340/startup/Makefile.am b/c/src/lib/libbsp/m68k/gen68340/startup/Makefile.am
index 59645567f6..0808e981d9 100644
--- a/c/src/lib/libbsp/m68k/gen68340/startup/Makefile.am
+++ b/c/src/lib/libbsp/m68k/gen68340/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/gen68340/startup/bspstart.c b/c/src/lib/libbsp/m68k/gen68340/startup/bspstart.c
index 23f5a13bf5..a9e6823ef5 100644
--- a/c/src/lib/libbsp/m68k/gen68340/startup/bspstart.c
+++ b/c/src/lib/libbsp/m68k/gen68340/startup/bspstart.c
@@ -54,7 +54,11 @@ void bsp_pretasking_hook(void);               /* m68k version */
 
 void bsp_start( void )
 {
-  extern void *_WorkspaceBase;
+  extern void          *_WorkspaceBase;
+  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
@@ -75,12 +79,6 @@ void bsp_start( void )
 
   BSP_Configuration.work_space_start = (void *)&_WorkspaceBase;
 
-  /*
-   *  Account for the console's resources
-   */
-
-  console_reserve_resources( &BSP_Configuration );
-
   /*
    *  initialize the CPU table for this BSP
    */
@@ -88,5 +86,5 @@ 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;
 }
diff --git a/c/src/lib/libbsp/m68k/gen68340/startup/linkcmds b/c/src/lib/libbsp/m68k/gen68340/startup/linkcmds
index 297579ce25..e49ec2ec39 100644
--- a/c/src/lib/libbsp/m68k/gen68340/startup/linkcmds
+++ b/c/src/lib/libbsp/m68k/gen68340/startup/linkcmds
@@ -20,7 +20,7 @@
 /*
  * Declare some sizes.
  */
-_RamBase = 0x10000000;
+_RamBase = DEFINED(_RamBase) ? _RamBase : 0x10000000;
 _RamSize = DEFINED(_RamSize) ? _RamSize : 4M;
 _HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x10000;
 _StackSize = DEFINED(_StackSize) ? _StackSize : 0x1000;
-- 
cgit v1.2.3