From e150cdbfe4606227483c6fb06004a770c7c7c154 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 16 Sep 2008 22:16:46 +0000 Subject: 2008-09-16 Joel Sherrill * Makefile.am, startup/linkcmds: Use top level shared bsp_get_work_area() implementation. * startup/bspgetworkarea.c: Removed. --- c/src/lib/libbsp/mips/csb350/ChangeLog | 6 +++ c/src/lib/libbsp/mips/csb350/Makefile.am | 2 +- .../libbsp/mips/csb350/startup/bspgetworkarea.c | 43 ---------------------- c/src/lib/libbsp/mips/csb350/startup/linkcmds | 10 +++-- 4 files changed, 14 insertions(+), 47 deletions(-) delete mode 100644 c/src/lib/libbsp/mips/csb350/startup/bspgetworkarea.c (limited to 'c/src/lib/libbsp') diff --git a/c/src/lib/libbsp/mips/csb350/ChangeLog b/c/src/lib/libbsp/mips/csb350/ChangeLog index 71d36b8619..0e70b3eeee 100644 --- a/c/src/lib/libbsp/mips/csb350/ChangeLog +++ b/c/src/lib/libbsp/mips/csb350/ChangeLog @@ -1,3 +1,9 @@ +2008-09-16 Joel Sherrill + + * Makefile.am, startup/linkcmds: Use top level shared + bsp_get_work_area() implementation. + * startup/bspgetworkarea.c: Removed. + 2008-09-16 Joel Sherrill * startup/bspstart.c: Remove unnecessary includes of diff --git a/c/src/lib/libbsp/mips/csb350/Makefile.am b/c/src/lib/libbsp/mips/csb350/Makefile.am index 4329d8add4..9cbfe9977e 100644 --- a/c/src/lib/libbsp/mips/csb350/Makefile.am +++ b/c/src/lib/libbsp/mips/csb350/Makefile.am @@ -27,7 +27,7 @@ dist_project_lib_DATA += startup/linkcmds startup_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppredriverhook.c ../../shared/bsppost.c \ - ../../shared/bsppretaskinghook.c startup/bspgetworkarea.c \ + ../../shared/bsppretaskinghook.c ../../shared/bspgetworkarea.c \ startup/bspstart.c ../../shared/bootcard.c ../../shared/sbrk.c \ ../../shared/gnatinstallhandler.c ../../shared/setvec.c clock_SOURCES = clock/clockdrv.c diff --git a/c/src/lib/libbsp/mips/csb350/startup/bspgetworkarea.c b/c/src/lib/libbsp/mips/csb350/startup/bspgetworkarea.c deleted file mode 100644 index d8f4be7095..0000000000 --- a/c/src/lib/libbsp/mips/csb350/startup/bspgetworkarea.c +++ /dev/null @@ -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 -#include -#include - -extern void *_sdram_size; -extern void *_sdram_base; -extern void *_bss_free_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; - - /* - * Old code had hard-coded heap size of 0x20000 and a comment indicating - * something about the undefined symbol MEM_NOCACHE_SIZE. - */ - size = (uintptr_t)&_sdram_base + (uintptr_t)&_sdram_size - - (uintptr_t)&_bss_free_start; - - *work_area_start = (void *)&_bss_free_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/mips/csb350/startup/linkcmds b/c/src/lib/libbsp/mips/csb350/startup/linkcmds index 08c5040f1c..4336bfd401 100644 --- a/c/src/lib/libbsp/mips/csb350/startup/linkcmds +++ b/c/src/lib/libbsp/mips/csb350/startup/linkcmds @@ -10,11 +10,15 @@ * Declare some sizes. */ -_StackSize = DEFINED(_StackSize) ? _StackSize : 0x4000; - _sdram_base = DEFINED(_sdram_base) ? _sdram_base : 0x80400000; _sdram_size = DEFINED(_sdram_size) ? _sdram_size : 12M; +/* standard items provided by RTEMS linkcmds files */ +RamBase = _sdram_base; +RamSize = _sdram_size; +HeapSize = DEFINED(HeapSize) ? HeapSize : 0x0; +_StackSize = DEFINED(_StackSize) ? _StackSize : 0x4000; + MEMORY { @@ -170,7 +174,7 @@ SECTIONS end = .; _end = .; . = ALIGN (1024); - _bss_free_start = .; + WorkAreaBase = .; } >ram -- cgit v1.2.3