RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2008-09-16 Joel Sherrill <joel.sherrill@oarcorp.com>

Browse Source 
* Makefile.am, startup/linkcmds: Use top level shared
	bsp_get_work_area() implementation.
	* startup/bspgetworkarea.c: Removed.
This commit is contained in:
Joel Sherrill
2008-09-16 21:14:25 +00:00
parent c4e0484c72
commit 91b8fcfb81
8 changed files with 22 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
c/src/lib/libbsp/mips/genmongoosev/ChangeLog
View File

@@ -1,3 +1,9 @@
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

2
c/src/lib/libbsp/mips/genmongoosev/Makefile.am
View File

@@ -30,7 +30,7 @@ startup_SOURCES = ../../shared/bspclean.c ../../shared/bsppretaskinghook.c \
../../shared/bsppredriverhook.c ../../shared/bsplibc.c \
../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \
../../shared/sbrk.c ../../shared/gnatinstallhandler.c \
../../shared/setvec.c startup/bspgetworkarea.c
../../shared/setvec.c ../../shared/bspgetworkarea.c
clock_SOURCES = clock/clockdrv.c
console_SOURCES = console/conscfg.c ../../shared/console.c
timer_SOURCES = timer/timer.c

43
c/src/lib/libbsp/mips/genmongoosev/startup/bspgetworkarea.c
View File

@@ -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 *WorkspaceBase;
extern void *_RamBase;
extern void *_RamSize;
/*
* 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)&_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;
}

9
c/src/lib/libbsp/mips/genmongoosev/startup/linkcmds
View File

@@ -11,13 +11,12 @@
* Declare some sizes.
*/
_RamBase = DEFINED(_RamBase) ? _RamBase : 0x80000000;
_RamSize = DEFINED(_RamSize) ? _RamSize : 32M;
RamBase = DEFINED(RamBase) ? RamBase : 0x80000000;
RamSize = DEFINED(RamSize) ? RamSize : 32M;
HeapSize = DEFINED(HeapSize) ? HeapSize : 0x0;
_StackSize = DEFINED(_StackSize) ? _StackSize : 0x4000;
ClockRate = DEFINED(ClockRate) ? ClockRate : 12000000;
MEMORY
{
ram : ORIGIN = 0x80020000, LENGTH = 4M
@@ -169,7 +168,7 @@ SECTIONS
__stack = .;
_stack_init = .;
_clear_end = .;
WorkspaceBase = .;
WorkAreaBase = .;
end = .;
_end = .;
} >ram

6
c/src/lib/libbsp/mips/hurricane/ChangeLog
View File

@@ -1,3 +1,9 @@
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>
* clock/ckinit.c, startup/bspstart.c: Remove unnecessary includes of

2
c/src/lib/libbsp/mips/hurricane/Makefile.am
View File

@@ -30,7 +30,7 @@ dist_project_lib_DATA += startup/linkcmds
startup_SOURCES = ../../shared/bspclean.c \
../../shared/bsplibc.c ../../shared/bsppost.c \
../../shared/bsppretaskinghook.c startup/bspgetworkarea.c \
../../shared/bsppretaskinghook.c ../../shared/bspgetworkarea.c \
../../shared/bsppredriverhook.c startup/bspstart.c \
../../shared/bootcard.c ../../shared/sbrk.c \
../../shared/gnatinstallhandler.c ../../shared/setvec.c \

38
c/src/lib/libbsp/mips/hurricane/startup/bspgetworkarea.c
View File

@@ -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;
}

6
c/src/lib/libbsp/mips/hurricane/startup/linkcmds
View File

@@ -5,8 +5,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
@@ -147,6 +148,7 @@ SECTIONS
_stack_init = .;
end = .;
_end = .;
WorkAreaBase = .;
}