From 0729c2d92888d9342637f6e64e5b3e128f2e479a Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 12 Sep 2008 20:25:34 +0000 Subject: [PATCH] 2008-09-12 Joel Sherrill * Makefile.am: Split out bsp_get_work_area() into its own file and user BSP Framework to perform more initialization. Let edb7312 and csb336 shared the implementation. * startup/bspgetworkarea.c: Removed. --- c/src/lib/libbsp/arm/edb7312/ChangeLog | 7 +++ c/src/lib/libbsp/arm/edb7312/Makefile.am | 2 +- .../arm/edb7312/startup/bspgetworkarea.c | 43 ------------------- 3 files changed, 8 insertions(+), 44 deletions(-) delete mode 100644 c/src/lib/libbsp/arm/edb7312/startup/bspgetworkarea.c diff --git a/c/src/lib/libbsp/arm/edb7312/ChangeLog b/c/src/lib/libbsp/arm/edb7312/ChangeLog index 6703b887d9..fcab94082b 100644 --- a/c/src/lib/libbsp/arm/edb7312/ChangeLog +++ b/c/src/lib/libbsp/arm/edb7312/ChangeLog @@ -1,3 +1,10 @@ +2008-09-12 Joel Sherrill + + * Makefile.am: Split out bsp_get_work_area() into its own file and user + BSP Framework to perform more initialization. Let edb7312 and csb336 + shared the implementation. + * startup/bspgetworkarea.c: Removed. + 2008-09-10 Joel Sherrill * Makefile.am, configure.ac, startup/bspstart.c: Split out diff --git a/c/src/lib/libbsp/arm/edb7312/Makefile.am b/c/src/lib/libbsp/arm/edb7312/Makefile.am index f7a83a1d84..388e539164 100644 --- a/c/src/lib/libbsp/arm/edb7312/Makefile.am +++ b/c/src/lib/libbsp/arm/edb7312/Makefile.am @@ -28,7 +28,7 @@ dist_project_lib_DATA += startup/linkcmds include_HEADERS += ../../arm/shared/comm/uart.h startup_SOURCES = ../../shared/bsppost.c ../../shared/bsplibc.c \ - startup/bspgetworkarea.c ../../shared/bsppretaskinghook.c \ + ../shared/bspgetworkarea.c ../../shared/bsppretaskinghook.c \ ../../shared/bsppredriverhook.c startup/bspstart.c \ startup/bspclean.c ../../shared/bootcard.c ../../shared/sbrk.c \ ../../shared/gnatinstallhandler.c diff --git a/c/src/lib/libbsp/arm/edb7312/startup/bspgetworkarea.c b/c/src/lib/libbsp/arm/edb7312/startup/bspgetworkarea.c deleted file mode 100644 index d8f4be7095..0000000000 --- a/c/src/lib/libbsp/arm/edb7312/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; -} -