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, 9 insertions, 42 deletions

diff --git a/c/src/lib/libbsp/powerpc/virtex/ChangeLog b/c/src/lib/libbsp/powerpc/virtex/ChangeLog
index 5beffb1d2b..cbebf997fd 100644
--- a/c/src/lib/libbsp/powerpc/virtex/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/virtex/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-15	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* Makefile.am, configure.ac, include/bsp.h, include/bspopts.h.in,
diff --git a/c/src/lib/libbsp/powerpc/virtex/Makefile.am b/c/src/lib/libbsp/powerpc/virtex/Makefile.am
index 7679c60e75..da6841fb78 100644
--- a/c/src/lib/libbsp/powerpc/virtex/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex/Makefile.am
@@ -32,7 +32,7 @@ project_lib_DATA = rtems_crti.$(OBJEXT)
 
 dist_project_lib_DATA += startup/linkcmds
 
-startup_SOURCES = startup/bspclean.c startup/bspgetworkarea.c \
+startup_SOURCES = startup/bspclean.c ../../shared/bspgetworkarea.c \
     ../../shared/bsplibc.c \
     ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \
     ../../shared/bsppredriverhook.c ../../shared/bsppretaskinghook.c \
diff --git a/c/src/lib/libbsp/powerpc/virtex/startup/bspgetworkarea.c b/c/src/lib/libbsp/powerpc/virtex/startup/bspgetworkarea.c
deleted file mode 100644
index e8c464a1da..0000000000
--- a/c/src/lib/libbsp/powerpc/virtex/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/powerpc/virtex/startup/linkcmds b/c/src/lib/libbsp/powerpc/virtex/startup/linkcmds
index b429661f83..d8519583d9 100644
--- a/c/src/lib/libbsp/powerpc/virtex/startup/linkcmds
+++ b/c/src/lib/libbsp/powerpc/virtex/startup/linkcmds
@@ -19,6 +19,7 @@ ENTRY(download_entry)
 
 RamBase = DEFINED(RamBase) ? RamBase : 0x0;
 RamSize = DEFINED(RamSize) ? RamSize : 128M;
+HeapSize = DEFINED(HeapSize) ? HeapSize : 0x0;
 
 MEMORY
 {
@@ -247,8 +248,7 @@ SECTIONS
     IntrStack_end = .;
  
     PROVIDE(_end = . );
-    WorkSpaceStart = .;
-
+    WorkAreaBase = .;
 
     .gzipmalloc : {
 	. = ALIGN (16);