diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-09-16 20:48:21 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-09-16 20:48:21 +0000 |
commit | 2bd510395b6042689c0a05c5be600ab3c0d81cb9 (patch) | |
tree | 59f19d6dfe4b91f525a38ec449f62ea1a8d99290 | |
parent | 2008-09-16 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
download | rtems-2bd510395b6042689c0a05c5be600ab3c0d81cb9.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 '')
-rw-r--r-- | c/src/lib/libbsp/mips/rbtx4925/ChangeLog | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/mips/rbtx4925/Makefile.am | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/mips/rbtx4925/startup/bspgetworkarea.c | 38 | ||||
-rw-r--r-- | c/src/lib/libbsp/mips/rbtx4925/startup/linkcmds | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/mips/rbtx4938/ChangeLog | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/mips/rbtx4938/Makefile.am | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/mips/rbtx4938/startup/bspgetworkarea.c | 38 | ||||
-rw-r--r-- | c/src/lib/libbsp/mips/rbtx4938/startup/linkcmds | 6 |
8 files changed, 22 insertions, 82 deletions
diff --git a/c/src/lib/libbsp/mips/rbtx4925/ChangeLog b/c/src/lib/libbsp/mips/rbtx4925/ChangeLog index dccb30fd45..f4759064e6 100644 --- a/c/src/lib/libbsp/mips/rbtx4925/ChangeLog +++ b/c/src/lib/libbsp/mips/rbtx4925/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/rbtx4925/Makefile.am b/c/src/lib/libbsp/mips/rbtx4925/Makefile.am index 0a0a88e02c..ddb3c9c016 100644 --- a/c/src/lib/libbsp/mips/rbtx4925/Makefile.am +++ b/c/src/lib/libbsp/mips/rbtx4925/Makefile.am @@ -28,7 +28,7 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds startup_SOURCES = ../../shared/bspclean.c ../../shared/bsppredriverhook.c \ - ../../shared/bsppretaskinghook.c startup/bspgetworkarea.c \ + ../../shared/bsppretaskinghook.c ../../shared/bspgetworkarea.c \ ../../shared/bsplibc.c ../../shared/bsppost.c startup/bspstart.c \ ../../shared/bootcard.c ../../shared/sbrk.c \ ../../shared/gnatinstallhandler.c ../../shared/setvec.c \ diff --git a/c/src/lib/libbsp/mips/rbtx4925/startup/bspgetworkarea.c b/c/src/lib/libbsp/mips/rbtx4925/startup/bspgetworkarea.c deleted file mode 100644 index 6ce807ccf1..0000000000 --- a/c/src/lib/libbsp/mips/rbtx4925/startup/bspgetworkarea.c +++ /dev/null @@ -1,38 +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 *end; - -/* - * 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)&end; - - *work_area_start = (void *)&end; - *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/rbtx4925/startup/linkcmds b/c/src/lib/libbsp/mips/rbtx4925/startup/linkcmds index 8e5fa2c95f..843d764634 100644 --- a/c/src/lib/libbsp/mips/rbtx4925/startup/linkcmds +++ b/c/src/lib/libbsp/mips/rbtx4925/startup/linkcmds @@ -6,8 +6,9 @@ /* * Declare some sizes. */ -_RamBase = DEFINED(_RamBase) ? _RamBase : 0x80000000; -_RamSize = DEFINED(_RamSize) ? _RamSize : 4M; +RamBase = DEFINED(RamBase) ? RamBase : 0x80000000; +RamSize = DEFINED(RamSize) ? RamSize : 4M; +HeapSize = DEFINED(HeapSize) ? HeapSize : 0x0; _StackSize = DEFINED(_StackSize) ? _StackSize : 0x1000; SECTIONS @@ -148,6 +149,7 @@ SECTIONS _stack_init = .; end = .; _end = .; + WorkAreaBase = .; } diff --git a/c/src/lib/libbsp/mips/rbtx4938/ChangeLog b/c/src/lib/libbsp/mips/rbtx4938/ChangeLog index 754f2a30bf..fc99d52aae 100644 --- a/c/src/lib/libbsp/mips/rbtx4938/ChangeLog +++ b/c/src/lib/libbsp/mips/rbtx4938/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/rbtx4938/Makefile.am b/c/src/lib/libbsp/mips/rbtx4938/Makefile.am index ec974c1a5e..7cdceec41e 100644 --- a/c/src/lib/libbsp/mips/rbtx4938/Makefile.am +++ b/c/src/lib/libbsp/mips/rbtx4938/Makefile.am @@ -28,7 +28,7 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds startup_SOURCES = ../../shared/bspclean.c ../../shared/bsppredriverhook.c \ - ../../shared/bsppretaskinghook.c startup/bspgetworkarea.c \ + ../../shared/bsppretaskinghook.c ../../shared/bspgetworkarea.c \ ../../shared/bsplibc.c ../../shared/bsppost.c startup/bspstart.c \ ../../shared/bootcard.c ../../shared/sbrk.c \ ../../shared/gnatinstallhandler.c ../../shared/setvec.c \ diff --git a/c/src/lib/libbsp/mips/rbtx4938/startup/bspgetworkarea.c b/c/src/lib/libbsp/mips/rbtx4938/startup/bspgetworkarea.c deleted file mode 100644 index 6ce807ccf1..0000000000 --- a/c/src/lib/libbsp/mips/rbtx4938/startup/bspgetworkarea.c +++ /dev/null @@ -1,38 +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 *end; - -/* - * 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)&end; - - *work_area_start = (void *)&end; - *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/rbtx4938/startup/linkcmds b/c/src/lib/libbsp/mips/rbtx4938/startup/linkcmds index eaed5c51b5..5eb4728132 100644 --- a/c/src/lib/libbsp/mips/rbtx4938/startup/linkcmds +++ b/c/src/lib/libbsp/mips/rbtx4938/startup/linkcmds @@ -6,8 +6,9 @@ /* * Declare some sizes. */ -_RamBase = DEFINED(_RamBase) ? _RamBase : 0x80000000; -_RamSize = DEFINED(_RamSize) ? _RamSize : 4M; +RamBase = DEFINED(RamBase) ? RamBase : 0x80000000; +RamSize = DEFINED(RamSize) ? RamSize : 4M; +HeapSize = DEFINED(HeapSize) ? HeapSize : 0x0; _StackSize = DEFINED(_StackSize) ? _StackSize : 0x1000; SECTIONS @@ -148,6 +149,7 @@ SECTIONS _stack_init = .; end = .; _end = .; + WorkAreaBase = .; } |