summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--c/src/lib/libbsp/sparc/leon3/ChangeLog5
-rw-r--r--c/src/lib/libbsp/sparc/leon3/Makefile.am4
-rw-r--r--c/src/lib/libbsp/sparc/leon3/startup/bspstart.c32
3 files changed, 7 insertions, 34 deletions
diff --git a/c/src/lib/libbsp/sparc/leon3/ChangeLog b/c/src/lib/libbsp/sparc/leon3/ChangeLog
index 95814dd3a1..b3ec57efec 100644
--- a/c/src/lib/libbsp/sparc/leon3/ChangeLog
+++ b/c/src/lib/libbsp/sparc/leon3/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-14 Joel Sherrill <joel.sherrill@oarcorp.com>
+
+ * Makefile.am, startup/bspstart.c: Use shared bsp_get_work_area() into
+ its own file and use BSP Framework to perform more initialization.
+
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/sparc/leon3/Makefile.am b/c/src/lib/libbsp/sparc/leon3/Makefile.am
index 3e74513d45..0a0c27876d 100644
--- a/c/src/lib/libbsp/sparc/leon3/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon3/Makefile.am
@@ -34,8 +34,8 @@ project_lib_DATA = start.$(OBJEXT)
dist_project_lib_DATA += startup/linkcmds
startup_SOURCES = ../../sparc/shared/bspclean.c ../../shared/bsplibc.c \
- ../../shared/bsppost.c startup/bspstart.c \
- ../../shared/bootcard.c ../../shared/sbrk.c startup/setvec.c \
+ ../../shared/bsppost.c ../../shared/bootcard.c startup/bspstart.c \
+ ../../sparc/shared/bspgetworkarea.c ../../shared/sbrk.c startup/setvec.c \
startup/spurious.c startup/ithread.S
gnatsupp_SOURCES = gnatsupp/gnatsupp.c ../../sparc/shared/gnatcommon.c
diff --git a/c/src/lib/libbsp/sparc/leon3/startup/bspstart.c b/c/src/lib/libbsp/sparc/leon3/startup/bspstart.c
index dd3b3d486e..0f7a8ba977 100644
--- a/c/src/lib/libbsp/sparc/leon3/startup/bspstart.c
+++ b/c/src/lib/libbsp/sparc/leon3/startup/bspstart.c
@@ -19,20 +19,9 @@
*/
-#include <string.h>
-
#include <bsp.h>
-#include <bsp/bootcard.h>
#include <rtems/bspIo.h>
-/* must be identical to STACK_SIZE in start.S */
-#define STACK_SIZE 16 * 1024
-
-/*
- * Tells us where to put the workspace in case remote debugger is present.
- */
-extern uint32_t rdb_start;
-
/*
* Tells us if data cache snooping is available
*/
@@ -70,27 +59,6 @@ void bsp_pretasking_hook(void)
}
/*
- * 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
-)
-{
- /* Tells us where to put the workspace in case remote debugger is present. */
- extern uint32_t rdb_start;
-
- *work_area_start = &end;
- *work_area_size = (void *)rdb_start - (void *)&end - STACK_SIZE;
- *heap_start = BSP_BOOTCARD_HEAP_USES_WORK_AREA;
- *heap_size = BSP_BOOTCARD_HEAP_SIZE_DEFAULT;
-}
-
-/*
* bsp_start
*
* This routine does the bulk of the system initialization.