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/haleakala/startup | |
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/haleakala/startup')
-rw-r--r-- | c/src/lib/libbsp/powerpc/haleakala/startup/bspgetworkarea.c | 37 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/haleakala/startup/linkcmds | 9 |
2 files changed, 5 insertions, 41 deletions
diff --git a/c/src/lib/libbsp/powerpc/haleakala/startup/bspgetworkarea.c b/c/src/lib/libbsp/powerpc/haleakala/startup/bspgetworkarea.c deleted file mode 100644 index 8893220392..0000000000 --- a/c/src/lib/libbsp/powerpc/haleakala/startup/bspgetworkarea.c +++ /dev/null @@ -1,37 +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 *_WorkspaceStart; -extern void *_RAMEnd; - -/* - * 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)&_RAMEnd - (uintptr_t)&_WorkspaceStart; - - *work_area_start = (void *)&_WorkspaceStart; - *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/haleakala/startup/linkcmds b/c/src/lib/libbsp/powerpc/haleakala/startup/linkcmds index 65b84cbfb4..a16bc05873 100644 --- a/c/src/lib/libbsp/powerpc/haleakala/startup/linkcmds +++ b/c/src/lib/libbsp/powerpc/haleakala/startup/linkcmds @@ -18,6 +18,10 @@ ENTRY(download_entry) kIntrStackSize = 16K; kMainStackSize = 64K; +RamBase = DEFINED(RamBase) ? RamBase : 0; +RamSize = DEFINED(RamSize) ? RamSize : 256M; +HeapSize = DEFINED(HeapSize) ? HeapSize : 0x0; + MEMORY { RAM : ORIGIN = 0, LENGTH = 256M /*FLASH : ORIGIN = 0xFFE00000, LENGTH = 16M*/ @@ -238,10 +242,7 @@ SECTIONS stack.end = .; /* RTEMS workspace: size specified by application */ - _WorkspaceStart = ALIGN(0x20); - - /* Heap: from end of the workspace to _RAMEnd */ - _RAMEnd = ORIGIN(RAM) + LENGTH(RAM); + WorkAreaBase = ALIGN(0x20); /* Debugging information */ .line 0 : { *(.line) } |