summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2008-09-16 22:16:46 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2008-09-16 22:16:46 +0000
commite150cdbfe4606227483c6fb06004a770c7c7c154 (patch)
treeea9f3a69b6f63f0d2e94878495614cf24c8ee4b3 /c/src/lib/libbsp
parent2008-09-16 Joel Sherrill <joel.sherrill@oarcorp.com> (diff)
downloadrtems-e150cdbfe4606227483c6fb06004a770c7c7c154.tar.bz2
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.
Diffstat (limited to 'c/src/lib/libbsp')
-rw-r--r--c/src/lib/libbsp/mips/csb350/ChangeLog6
-rw-r--r--c/src/lib/libbsp/mips/csb350/Makefile.am2
-rw-r--r--c/src/lib/libbsp/mips/csb350/startup/bspgetworkarea.c43
-rw-r--r--c/src/lib/libbsp/mips/csb350/startup/linkcmds10
4 files changed, 14 insertions, 47 deletions
diff --git a/c/src/lib/libbsp/mips/csb350/ChangeLog b/c/src/lib/libbsp/mips/csb350/ChangeLog
index 71d36b8619..0e70b3eeee 100644
--- a/c/src/lib/libbsp/mips/csb350/ChangeLog
+++ b/c/src/lib/libbsp/mips/csb350/ChangeLog
@@ -1,5 +1,11 @@
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-16 Joel Sherrill <joel.sherrill@oarcorp.com>
+
* startup/bspstart.c: Remove unnecessary includes of
rtems/libcsupport.h and rtems/libio.h.
diff --git a/c/src/lib/libbsp/mips/csb350/Makefile.am b/c/src/lib/libbsp/mips/csb350/Makefile.am
index 4329d8add4..9cbfe9977e 100644
--- a/c/src/lib/libbsp/mips/csb350/Makefile.am
+++ b/c/src/lib/libbsp/mips/csb350/Makefile.am
@@ -27,7 +27,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/csb350/startup/bspgetworkarea.c b/c/src/lib/libbsp/mips/csb350/startup/bspgetworkarea.c
deleted file mode 100644
index d8f4be7095..0000000000
--- a/c/src/lib/libbsp/mips/csb350/startup/bspgetworkarea.c
+++ /dev/null
@@ -1,43 +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 *_sdram_size;
-extern void *_sdram_base;
-extern void *_bss_free_start;
-
-/*
- * 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;
-
- /*
- * Old code had hard-coded heap size of 0x20000 and a comment indicating
- * something about the undefined symbol MEM_NOCACHE_SIZE.
- */
- size = (uintptr_t)&_sdram_base + (uintptr_t)&_sdram_size
- - (uintptr_t)&_bss_free_start;
-
- *work_area_start = (void *)&_bss_free_start;
- *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/mips/csb350/startup/linkcmds b/c/src/lib/libbsp/mips/csb350/startup/linkcmds
index 08c5040f1c..4336bfd401 100644
--- a/c/src/lib/libbsp/mips/csb350/startup/linkcmds
+++ b/c/src/lib/libbsp/mips/csb350/startup/linkcmds
@@ -10,11 +10,15 @@
* Declare some sizes.
*/
-_StackSize = DEFINED(_StackSize) ? _StackSize : 0x4000;
-
_sdram_base = DEFINED(_sdram_base) ? _sdram_base : 0x80400000;
_sdram_size = DEFINED(_sdram_size) ? _sdram_size : 12M;
+/* standard items provided by RTEMS linkcmds files */
+RamBase = _sdram_base;
+RamSize = _sdram_size;
+HeapSize = DEFINED(HeapSize) ? HeapSize : 0x0;
+_StackSize = DEFINED(_StackSize) ? _StackSize : 0x4000;
+
MEMORY
{
@@ -170,7 +174,7 @@ SECTIONS
end = .;
_end = .;
. = ALIGN (1024);
- _bss_free_start = .;
+ WorkAreaBase = .;
} >ram