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

	* Makefile.am, startup/linkcmds: Use top level shared
	bsp_get_work_area() implementation.
	* startup/bspgetworkarea.c: Removed.

4 files changed, 12 insertions, 43 deletions

diff --git a/c/src/lib/libbsp/mips/jmr3904/ChangeLog b/c/src/lib/libbsp/mips/jmr3904/ChangeLog
index 0d2034bcca..4fd03fa1ce 100644
--- a/c/src/lib/libbsp/mips/jmr3904/ChangeLog
+++ b/c/src/lib/libbsp/mips/jmr3904/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-16	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* Makefile.am, startup/linkcmds: Use top level shared
+	bsp_get_work_area() implementation.
+	* startup/bspgetworkarea.c: Removed.
+
 2008-09-14	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* Makefile.am, startup/bspstart.c: Split out bsp_get_work_area() into
diff --git a/c/src/lib/libbsp/mips/jmr3904/Makefile.am b/c/src/lib/libbsp/mips/jmr3904/Makefile.am
index 99ff82ed5d..6b3b0d02ed 100644
--- a/c/src/lib/libbsp/mips/jmr3904/Makefile.am
+++ b/c/src/lib/libbsp/mips/jmr3904/Makefile.am
@@ -31,7 +31,7 @@ dist_project_lib_DATA += startup/linkcmds
 
 startup_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
     ../../shared/bsppredriverhook.c ../../shared/bsppost.c \
-    ../../shared/bsppretaskinghook.c startup/bspgetworkarea.c \
+    ../../shared/bsppretaskinghook.c ../../shared/bspgetworkarea.c \
     startup/bspstart.c ../../shared/bootcard.c ../../shared/sbrk.c \
     ../../shared/gnatinstallhandler.c ../../shared/setvec.c
 clock_SOURCES = clock/clockdrv.c
diff --git a/c/src/lib/libbsp/mips/jmr3904/startup/bspgetworkarea.c b/c/src/lib/libbsp/mips/jmr3904/startup/bspgetworkarea.c
deleted file mode 100644
index f491b8f3ba..0000000000
--- a/c/src/lib/libbsp/mips/jmr3904/startup/bspgetworkarea.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *  COPYRIGHT (c) 1989-2008.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.com/license/LICENSE.
- *
- *  $Id$
- */
-
-#include <bsp.h>
-#include <bsp/bootcard.h>
-
-extern int WorkspaceBase;
-extern int end;
-
-/*
- *  This method returns the base address and size of the area which
- *  is to be allocated between the RTEMS Workspace and the C Program
- *  Heap.
- */
-void bsp_get_work_area(
-  void   **work_area_start,
-  size_t  *work_area_size,
-  void   **heap_start,
-  size_t  *heap_size
-)
-{
-  *work_area_start       = &WorkspaceBase;
-  *work_area_size       = (void *)&end - (void *)&WorkspaceBase;
-  *heap_start = BSP_BOOTCARD_HEAP_USES_WORK_AREA;
-  *heap_size = BSP_BOOTCARD_HEAP_SIZE_DEFAULT;
-}
diff --git a/c/src/lib/libbsp/mips/jmr3904/startup/linkcmds b/c/src/lib/libbsp/mips/jmr3904/startup/linkcmds
index 404fe80bf4..9cb6608f1f 100644
--- a/c/src/lib/libbsp/mips/jmr3904/startup/linkcmds
+++ b/c/src/lib/libbsp/mips/jmr3904/startup/linkcmds
@@ -7,9 +7,9 @@
 /*
  * Declare some sizes.
  */
-_RamBase = DEFINED(_RamBase) ? _RamBase : 0x0;
-_RamSize = DEFINED(_RamSize) ? _RamSize : 1M;
-HeapSize = DEFINED(HeapSize) ? HeapSize : 0x80000;
+RamBase = DEFINED(RamBase) ? RamBase : 0x88000000;
+RamSize = DEFINED(RamSize) ? RamSize : 4M;
+HeapSize = DEFINED(HeapSize) ? HeapSize : 0x0;
 _StackSize = DEFINED(_StackSize) ? _StackSize : 0x1000;
 
 SECTIONS
@@ -139,13 +139,10 @@ SECTIONS
     . += _StackSize;
     __stack = .;
     _stack_init = .;
-    HeapBase = .;
-    . += HeapSize;    /* reserve some memory for heap */
-    WorkspaceBase = .;
-     /* HACK -- tied to value bspstart */
-    . += 4096K;    /* reserve some memory for workspace */
+    WorkAreaBase = .;
     _clear_end = .;
   }
+  . = 0x88400000; /* reserve some memory for Work Area */
  end = .;
  _end = .;