diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-09-16 20:17:37 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-09-16 20:17:37 +0000 |
commit | 2d41fc5c52bb5d59301272f09e69dc8cf798898f (patch) | |
tree | 0ebea7b46d31e74b640a8c953814a670e5fed2d9 | |
parent | 2008-09-16 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
download | rtems-2d41fc5c52bb5d59301272f09e69dc8cf798898f.tar.bz2 |
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.
-rw-r--r-- | c/src/lib/libbsp/nios2/nios2_iss/ChangeLog | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/nios2/nios2_iss/Makefile.am | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/nios2/nios2_iss/include/bsp.h | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/nios2/nios2_iss/startup/bspgetworkarea.c | 41 | ||||
-rw-r--r-- | c/src/lib/libbsp/nios2/nios2_iss/startup/linkcmds | 4 |
5 files changed, 11 insertions, 45 deletions
diff --git a/c/src/lib/libbsp/nios2/nios2_iss/ChangeLog b/c/src/lib/libbsp/nios2/nios2_iss/ChangeLog index 5442e63b57..07bfac8922 100644 --- a/c/src/lib/libbsp/nios2/nios2_iss/ChangeLog +++ b/c/src/lib/libbsp/nios2/nios2_iss/ChangeLog @@ -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> * Makefile.am, startup/bspstart.c: Create bsp_get_work_area() into its diff --git a/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am b/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am index ad453629c6..1a9f981668 100644 --- a/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am +++ b/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am @@ -31,7 +31,7 @@ dist_project_lib_DATA += startup/linkcmds startup_SOURCES = startup/bspclean.c ../../shared/bsplibc.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/gnatinstallhandler.c clock_SOURCES = clock/clock.c diff --git a/c/src/lib/libbsp/nios2/nios2_iss/include/bsp.h b/c/src/lib/libbsp/nios2/nios2_iss/include/bsp.h index f0e76a4a69..4f041d521e 100644 --- a/c/src/lib/libbsp/nios2/nios2_iss/include/bsp.h +++ b/c/src/lib/libbsp/nios2/nios2_iss/include/bsp.h @@ -44,9 +44,6 @@ extern "C" { #define SYSTEM_BUS_WIDTH 32 -#define RAM_BASE 0 -#define RAM_BYTES 0x00800000 - #define JTAG_UART_BASE 0x08000000 #define JTAG_UART_IRQ 2 diff --git a/c/src/lib/libbsp/nios2/nios2_iss/startup/bspgetworkarea.c b/c/src/lib/libbsp/nios2/nios2_iss/startup/bspgetworkarea.c deleted file mode 100644 index ac8c0a0166..0000000000 --- a/c/src/lib/libbsp/nios2/nios2_iss/startup/bspgetworkarea.c +++ /dev/null @@ -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; -} - diff --git a/c/src/lib/libbsp/nios2/nios2_iss/startup/linkcmds b/c/src/lib/libbsp/nios2/nios2_iss/startup/linkcmds index 6c1079891d..f435acfe8c 100644 --- a/c/src/lib/libbsp/nios2/nios2_iss/startup/linkcmds +++ b/c/src/lib/libbsp/nios2/nios2_iss/startup/linkcmds @@ -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 { reset : ORIGIN = 0x00000000, LENGTH = 0x00000600 |