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.

2 files changed, 2 insertions, 40 deletions

diff --git a/c/src/lib/libbsp/c4x/c4xsim/startup/bspgetworkarea.c b/c/src/lib/libbsp/c4x/c4xsim/startup/bspgetworkarea.c
deleted file mode 100644
index e8c464a1da..0000000000
--- a/c/src/lib/libbsp/c4x/c4xsim/startup/bspgetworkarea.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *  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>
-#include <stdint.h>
-
-extern void *RamBase;
-extern void *RamSize;
-extern void *WorkSpaceStart;
-
-/*
- *  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
-)
-{
-  uintptr_t size;
-
-  size = (uintptr_t)&RamBase + (uintptr_t)&RamSize
-         - (uintptr_t)&WorkSpaceStart;
-
-  *work_area_start = (void *)&WorkSpaceStart;
-  *work_area_size  = size;
-  *heap_start      = BSP_BOOTCARD_HEAP_USES_WORK_AREA;
-  *heap_size       = BSP_BOOTCARD_HEAP_SIZE_DEFAULT;
-}
-
diff --git a/c/src/lib/libbsp/c4x/c4xsim/startup/linkcmds b/c/src/lib/libbsp/c4x/c4xsim/startup/linkcmds
index 2526b64663..46698ea4ba 100644
--- a/c/src/lib/libbsp/c4x/c4xsim/startup/linkcmds
+++ b/c/src/lib/libbsp/c4x/c4xsim/startup/linkcmds
@@ -4,6 +4,7 @@
 
 _RamBase = DEFINED(_RamBase) ? _RamBase : 0x0;
 _RamSize = DEFINED(_RamSize) ? _RamSize : 4M;
+_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x0;
 
 ENTRY(_start)
 SECTIONS
@@ -65,7 +66,7 @@ SECTIONS
   }
   .heap  :
   { 					
-    _WorkspaceBase = .;
+    _WorkAreaBase = .;
   }
 /*
   .sysmem  :