2008-09-16 Joel Sherrill <joel.sherrill@oarcorp.com>

	* Makefile.am, clock/ckinit.c, startup/bspstart.c, startup/linkcmds:
	Add use of bsp_get_work_area() in its own file and rely on BSP
	Framework to perform more initialization. Remove unnecessary includes
	of rtems/libio.h and rtems/libcsupport.h.

5 files changed, 9 insertions, 8 deletions

diff --git a/c/src/lib/libbsp/m68k/mvme136/ChangeLog b/c/src/lib/libbsp/m68k/mvme136/ChangeLog
index 4cbf06b56f..c515f62a7f 100644
--- a/c/src/lib/libbsp/m68k/mvme136/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mvme136/ChangeLog
@@ -1,3 +1,10 @@
+2008-09-16	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* Makefile.am, clock/ckinit.c, startup/bspstart.c, startup/linkcmds:
+	Add use of bsp_get_work_area() in its own file and rely on BSP
+	Framework to perform more initialization. Remove unnecessary includes
+	of rtems/libio.h and rtems/libcsupport.h.
+
 2008-09-10	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* include/bsp.h: Review of all bsp_cleanup() implementations. In this
diff --git a/c/src/lib/libbsp/m68k/mvme136/Makefile.am b/c/src/lib/libbsp/m68k/mvme136/Makefile.am
index 4b612148dd..4c7bb64c38 100644
--- a/c/src/lib/libbsp/m68k/mvme136/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme136/Makefile.am
@@ -29,8 +29,7 @@ dist_project_lib_DATA += startup/linkcmds
 startup_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
     ../../shared/bsppost.c ../../shared/bsppredriverhook.c  \
     startup/bspstart.c ../../shared/bootcard.c \
-    ../../shared/bsppretaskinghook.c \
-    ../../m68k/shared/m68kbspgetworkarea.c \
+    ../../shared/bsppretaskinghook.c ../../m68k/shared/m68kbspgetworkarea.c \
     ../../shared/sbrk.c ../../m68k/shared/setvec.c
 gnatsupp_SOURCES = ../../shared/gnatinstallhandler.c
 clock_SOURCES = clock/ckinit.c
diff --git a/c/src/lib/libbsp/m68k/mvme136/clock/ckinit.c b/c/src/lib/libbsp/m68k/mvme136/clock/ckinit.c
index 7e1e515c44..e305adeb57 100644
--- a/c/src/lib/libbsp/m68k/mvme136/clock/ckinit.c
+++ b/c/src/lib/libbsp/m68k/mvme136/clock/ckinit.c
@@ -20,7 +20,6 @@
 #include <stdlib.h>
 
 #include <bsp.h>
-#include <rtems/libio.h>
 #include <rtems/zilog/z8036.h>
 
 #define MICRVAL     0xe2            /* disable lower chain, no vec */
diff --git a/c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c b/c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c
index 3af97ee2ec..d1b659e194 100644
--- a/c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c
+++ b/c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c
@@ -14,11 +14,7 @@
  *  $Id$
  */
 
-#include <string.h>
-
 #include <bsp.h>
-#include <rtems/libio.h>
-#include <rtems/libcsupport.h>
 #include <rtems/zilog/z8036.h>
 
 /*
diff --git a/c/src/lib/libbsp/m68k/mvme136/startup/linkcmds b/c/src/lib/libbsp/m68k/mvme136/startup/linkcmds
index aeeb4c3856..08fe2b993a 100644
--- a/c/src/lib/libbsp/m68k/mvme136/startup/linkcmds
+++ b/c/src/lib/libbsp/m68k/mvme136/startup/linkcmds
@@ -17,7 +17,7 @@
  */
 _RamBase = DEFINED(_RamBase) ? _RamBase : 0x0;
 _RamSize = DEFINED(_RamSize) ? _RamSize : 1M;
-_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x10000;
+_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x0;
 _StackSize = DEFINED(_StackSize) ? _StackSize : 0x1000;
 
 MEMORY