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, include/bsp.h, 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 20:17:37 +00:00
parent 98d59afcb1
commit 2d41fc5c52
5 changed files with 11 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
c/src/lib/libbsp/nios2/nios2_iss/ChangeLog
View File

@@ -1,3 +1,9 @@
2008-09-16 Joel Sherrill <joel.sherrill@oarcorp.com>
* Makefile.am, include/bsp.h, startup/linkcmds: Use top level shared
bsp_get_work_area() implementation.
* startup/bspgetworkarea.c: Removed.
2008-09-14 Joel Sherrill <joel.sherrill@oarcorp.com> 2008-09-14 Joel Sherrill <joel.sherrill@oarcorp.com>
* Makefile.am, startup/bspstart.c: Create bsp_get_work_area() into its * Makefile.am, startup/bspstart.c: Create bsp_get_work_area() into its

2
c/src/lib/libbsp/nios2/nios2_iss/Makefile.am
View File

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

3
c/src/lib/libbsp/nios2/nios2_iss/include/bsp.h
View File

@@ -44,9 +44,6 @@ extern "C" {
#define SYSTEM_BUS_WIDTH 32 #define SYSTEM_BUS_WIDTH 32
#define RAM_BASE 0
#define RAM_BYTES 0x00800000
#define JTAG_UART_BASE 0x08000000 #define JTAG_UART_BASE 0x08000000
#define JTAG_UART_IRQ 2 #define JTAG_UART_IRQ 2

41
c/src/lib/libbsp/nios2/nios2_iss/startup/bspgetworkarea.c
View File

@@ -1,41 +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;
extern char __alt_heap_start[];
/*
* 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)&RAM_BASE + (uintptr_t)&RAM_BYTES
- (uintptr_t)&__alt_heap_start;
*work_area_start = (void *)__alt_heap_start;
*work_area_size = size;
*heap_start = BSP_BOOTCARD_HEAP_USES_WORK_AREA;
*heap_size = BSP_BOOTCARD_HEAP_SIZE_DEFAULT;
}

4
c/src/lib/libbsp/nios2/nios2_iss/startup/linkcmds
View File

@@ -21,6 +21,10 @@ DO NOT MODIFY THIS FILE
*/ */
RamBase = DEFINED(RamBase) ? RamBase : 0x00000000;
RamSize = DEFINED(RamSize) ? RamSize : 0x00800000;
HeapSize = DEFINED(HeapSize) ? HeapSize : 0x0;
MEMORY MEMORY
{ {
reset : ORIGIN = 0x00000000, LENGTH = 0x00000600 reset : ORIGIN = 0x00000000, LENGTH = 0x00000600