diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-09-16 21:35:23 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-09-16 21:35:23 +0000 |
commit | 284ed06a28de2736b2bc18d84150f5d958b8324c (patch) | |
tree | 5d308dc173cf3e6a9c89b6ade78e33803b43ae72 /c/src/lib/libbsp/powerpc/mbx8xx | |
parent | 2008-09-16 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
download | rtems-284ed06a28de2736b2bc18d84150f5d958b8324c.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/powerpc/mbx8xx')
-rw-r--r-- | c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/mbx8xx/startup/bspgetworkarea.c | 39 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/mbx8xx/startup/linkcmds | 5 |
4 files changed, 10 insertions, 42 deletions
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog b/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog index 8cf8316d8b..15875bc148 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog +++ b/c/src/lib/libbsp/powerpc/mbx8xx/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/powerpc/mbx8xx/Makefile.am b/c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am index 11ccebce00..198a7a418a 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am @@ -35,7 +35,7 @@ vectors_SOURCES = vectors/vectors.h vectors/vectors_init.c \ vectors/vectors.S startup_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppost.c ../../shared/bsppredriverhook.c \ - ../../shared/bsppretaskinghook.c startup/bspgetworkarea.c \ + ../../shared/bsppretaskinghook.c ../../shared/bspgetworkarea.c \ startup/bspstart.c ../../shared/bootcard.c \ startup/imbx8xx.c startup/mmutlbtab.c \ ../../shared/sbrk.c ../../shared/gnatinstallhandler.c startup/start.S diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/startup/bspgetworkarea.c b/c/src/lib/libbsp/powerpc/mbx8xx/startup/bspgetworkarea.c deleted file mode 100644 index f77fbb85ad..0000000000 --- a/c/src/lib/libbsp/powerpc/mbx8xx/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 *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 -) -{ - uintptr_t size; - - size = (uintptr_t)&RamBase + (uintptr_t)&RamSize - - (uintptr_t)&WorkspaceBase; - - *work_area_start = (void *)&WorkspaceBase; - *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/mbx8xx/startup/linkcmds b/c/src/lib/libbsp/powerpc/mbx8xx/startup/linkcmds index 52029ebafc..16c39f38da 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/startup/linkcmds +++ b/c/src/lib/libbsp/powerpc/mbx8xx/startup/linkcmds @@ -17,7 +17,8 @@ ENTRY(start) */ StackSize = DEFINED(StackSize) ? StackSize : 0x1000; RamBase = DEFINED(RamBase) ? RamBase : 0; -RamSize = DEFINED(RamSized) ? RamSize : 4M; +RamSize = DEFINED(RamSize) ? RamSize : 4M; +HeapSize = DEFINED(HeapSize) ? HeapSize : 0x0; MEMORY { @@ -263,7 +264,7 @@ SECTIONS intrStack = .; PROVIDE(intrStackPtr = intrStack); - WorkspaceBase = .; + WorkAreaBase = .; dpram : { |