summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2008-09-16 20:37:11 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2008-09-16 20:37:11 +0000
commit03f12976755a926af8c4081b65373f8c6a426163 (patch)
tree86c415ba16dd273cde969214ccf2fce0f00304d5
parent2008-09-16 Joel Sherrill <joel.sherrill@oarcorp.com> (diff)
downloadrtems-03f12976755a926af8c4081b65373f8c6a426163.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.
-rw-r--r--c/src/lib/libbsp/h8300/h8sim/ChangeLog6
-rw-r--r--c/src/lib/libbsp/h8300/h8sim/Makefile.am2
-rw-r--r--c/src/lib/libbsp/h8300/h8sim/startup/bspgetworkarea.c32
-rw-r--r--c/src/lib/libbsp/h8300/h8sim/startup/linkcmds6
4 files changed, 10 insertions, 36 deletions
diff --git a/c/src/lib/libbsp/h8300/h8sim/ChangeLog b/c/src/lib/libbsp/h8300/h8sim/ChangeLog
index 4798d40114..4fcbce4f04 100644
--- a/c/src/lib/libbsp/h8300/h8sim/ChangeLog
+++ b/c/src/lib/libbsp/h8300/h8sim/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/h8300/h8sim/Makefile.am b/c/src/lib/libbsp/h8300/h8sim/Makefile.am
index 19ded92a9a..576e49b989 100644
--- a/c/src/lib/libbsp/h8300/h8sim/Makefile.am
+++ b/c/src/lib/libbsp/h8300/h8sim/Makefile.am
@@ -27,7 +27,7 @@ dist_project_lib_DATA += startup/linkcmds
startup_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \
../../shared/bsppredriverhook.c ../../shared/bsppretaskinghook.c \
- startup/bspgetworkarea.c ../../shared/bsppost.c startup/bspstart.c \
+ ../../shared/bspgetworkarea.c ../../shared/bsppost.c startup/bspstart.c \
../../shared/bootcard.c ../../shared/sbrk.c \
../../shared/gnatinstallhandler.c startup/__main.c
clock_SOURCES = ../../shared/clock_driver_stub.c
diff --git a/c/src/lib/libbsp/h8300/h8sim/startup/bspgetworkarea.c b/c/src/lib/libbsp/h8300/h8sim/startup/bspgetworkarea.c
deleted file mode 100644
index 286b37e362..0000000000
--- a/c/src/lib/libbsp/h8300/h8sim/startup/bspgetworkarea.c
+++ /dev/null
@@ -1,32 +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 *WorkspaceBase;
-
-/*
- * 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 = (void *)&WorkspaceBase;
- *work_area_size = (256 * 1024) - - (uintptr_t)&WorkspaceBase;
- *heap_start = BSP_BOOTCARD_HEAP_USES_WORK_AREA;
- *heap_size = BSP_BOOTCARD_HEAP_SIZE_DEFAULT;
-}
-
diff --git a/c/src/lib/libbsp/h8300/h8sim/startup/linkcmds b/c/src/lib/libbsp/h8300/h8sim/startup/linkcmds
index 50e392be31..9e3284036d 100644
--- a/c/src/lib/libbsp/h8300/h8sim/startup/linkcmds
+++ b/c/src/lib/libbsp/h8300/h8sim/startup/linkcmds
@@ -7,8 +7,8 @@ OUTPUT_ARCH(h8300h)
* Declare some sizes.
*/
_RamBase = DEFINED(_RamBase) ? _RamBase : 0x0;
-_RamSize = DEFINED(_RamSize) ? _RamSize : 1M;
-_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x4000;
+_RamSize = DEFINED(_RamSize) ? _RamSize : 256K;
+_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x0;
_StackSize = DEFINED(_StackSize) ? _StackSize : 0x1000;
ENTRY("_start")
@@ -88,7 +88,7 @@ SECTIONS
. += _StackSize;
_stack_init = .;
_clear_end = .;
- _WorkspaceBase = .;
+ _WorkAreaBase = .;
_end = .;
__end = .;
} >ram