From 387a69a10e446a018b97d8cb1f00606ef4c5072d Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 19 Sep 2008 19:45:18 +0000 Subject: 2008-09-19 Joel Sherrill * Makefile.am, include/bsp.h, startup/bspstart.c, startup/linkcmds: Use PowerPC level shared bsp_get_work_area() implementation. * startup/bspgetworkarea.c: Removed. --- c/src/lib/libbsp/powerpc/score603e/ChangeLog | 6 +++ c/src/lib/libbsp/powerpc/score603e/Makefile.am | 6 +-- c/src/lib/libbsp/powerpc/score603e/include/bsp.h | 5 +++ .../powerpc/score603e/startup/bspgetworkarea.c | 44 ---------------------- .../libbsp/powerpc/score603e/startup/bspstart.c | 8 ++++ .../lib/libbsp/powerpc/score603e/startup/linkcmds | 3 ++ 6 files changed, 25 insertions(+), 47 deletions(-) delete mode 100644 c/src/lib/libbsp/powerpc/score603e/startup/bspgetworkarea.c diff --git a/c/src/lib/libbsp/powerpc/score603e/ChangeLog b/c/src/lib/libbsp/powerpc/score603e/ChangeLog index 92ebd57eef..42daf11ca6 100644 --- a/c/src/lib/libbsp/powerpc/score603e/ChangeLog +++ b/c/src/lib/libbsp/powerpc/score603e/ChangeLog @@ -1,3 +1,9 @@ +2008-09-19 Joel Sherrill + + * Makefile.am, include/bsp.h, startup/bspstart.c, startup/linkcmds: Use + PowerPC level shared bsp_get_work_area() implementation. + * startup/bspgetworkarea.c: Removed. + 2008-09-18 Joel Sherrill * startup/bspstart.c: Remove unused variable. diff --git a/c/src/lib/libbsp/powerpc/score603e/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/Makefile.am index 4566df3489..1aa0ed8316 100644 --- a/c/src/lib/libbsp/powerpc/score603e/Makefile.am +++ b/c/src/lib/libbsp/powerpc/score603e/Makefile.am @@ -26,9 +26,9 @@ include_HEADERS += include/coverhd.h include/gen2.h dist_project_lib_DATA += startup/linkcmds startup_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \ - startup/bspstart.c startup/bspgetworkarea.c ../../shared/bootcard.c \ - startup/Hwr_init.c ../../powerpc/shared/startup/sbrk.c \ - startup/genpvec.c ../../shared/gnatinstallhandler.c \ + startup/bspstart.c ../../powerpc/shared/startup/bspgetworkarea.c \ + ../../powerpc/shared/startup/sbrk.c ../../shared/bootcard.c \ + startup/Hwr_init.c startup/genpvec.c ../../shared/gnatinstallhandler.c \ ../../powerpc/shared/showbats.c \ ../../shared/bsppretaskinghook.c diff --git a/c/src/lib/libbsp/powerpc/score603e/include/bsp.h b/c/src/lib/libbsp/powerpc/score603e/include/bsp.h index d29580ca50..44c4b60fa9 100644 --- a/c/src/lib/libbsp/powerpc/score603e/include/bsp.h +++ b/c/src/lib/libbsp/powerpc/score603e/include/bsp.h @@ -93,6 +93,11 @@ extern int CPU_PPC_CLICKS_PER_MS; */ #define BSP_INIT_STACK_SIZE 0x1000 +/* + * Total RAM available + */ +extern unsigned int BSP_mem_size; + /* functions */ /* diff --git a/c/src/lib/libbsp/powerpc/score603e/startup/bspgetworkarea.c b/c/src/lib/libbsp/powerpc/score603e/startup/bspgetworkarea.c deleted file mode 100644 index a30866ebf3..0000000000 --- a/c/src/lib/libbsp/powerpc/score603e/startup/bspgetworkarea.c +++ /dev/null @@ -1,44 +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 *RAM_END; -extern void *__rtems_end; -extern uint32_t _bsp_sbrk_init(uint32_t, uint32_t*); - -unsigned int BSP_mem_size = (unsigned int)&RAM_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; - uintptr_t reserve; - - reserve = (uintptr_t)BSP_INIT_STACK_SIZE; - reserve += rtems_configuration_get_interrupt_stack_size(); - size = (uintptr_t)&RAM_END - (uintptr_t)&__rtems_end + reserve; - - *work_area_start = (void *)(&__rtems_end + reserve); - *work_area_size = size; - _bsp_sbrk_init( *work_area_start, work_area_size ); - *heap_start = BSP_BOOTCARD_HEAP_USES_WORK_AREA; - *heap_size = BSP_BOOTCARD_HEAP_SIZE_DEFAULT; -} - diff --git a/c/src/lib/libbsp/powerpc/score603e/startup/bspstart.c b/c/src/lib/libbsp/powerpc/score603e/startup/bspstart.c index 24a5b0aadb..e6c70a8fba 100644 --- a/c/src/lib/libbsp/powerpc/score603e/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/score603e/startup/bspstart.c @@ -28,6 +28,12 @@ */ unsigned int BSP_heap_start; +/* + * Total RAM available and associated linker symbol + */ +unsigned int BSP_mem_size; +extern char RamSize[]; + /* * PCI Bus Frequency */ @@ -266,7 +272,9 @@ void bsp_start( void ) */ intrStackStart = (uint32_t) __rtems_end + BSP_INIT_STACK_SIZE; intrStackSize = rtems_configuration_get_interrupt_stack_size(); + BSP_heap_start = intrStackStart + intrStackSize; + BSP_mem_size = (uintptr_t) RamSize; /* * Initialize default raw exception handlers. diff --git a/c/src/lib/libbsp/powerpc/score603e/startup/linkcmds b/c/src/lib/libbsp/powerpc/score603e/startup/linkcmds index 37f247c4aa..0b2a9f2073 100644 --- a/c/src/lib/libbsp/powerpc/score603e/startup/linkcmds +++ b/c/src/lib/libbsp/powerpc/score603e/startup/linkcmds @@ -12,6 +12,9 @@ ENTRY(_start) PROVIDE(CPU_PPC_CLICKS_PER_MS = 16500); +RamBase = DEFINED(RamBase) ? RamBase : 0x0; +RamSize = DEFINED(RamSize) ? RamSize : 31M; + MEMORY { VECTORS : ORIGIN = 0, LENGTH = 64K -- cgit v1.2.3