From f1359069e0d26bb1a1c299c0865d8c2a86bf2b39 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 15 Sep 2008 22:05:16 +0000 Subject: 2008-09-15 Joel Sherrill * Makefile.am, configure.ac, include/bsp.h, include/bspopts.h.in, startup/bspstart.c, startup/linkcmds: Add use of bsp_get_work_area() in its own file and rely on BSP Framework to perform more initialization. * startup/bspgetworkarea.c: New file. --- c/src/lib/libbsp/powerpc/virtex/startup/bspstart.c | 73 ---------------------- 1 file changed, 73 deletions(-) (limited to 'c/src/lib/libbsp/powerpc/virtex/startup/bspstart.c') diff --git a/c/src/lib/libbsp/powerpc/virtex/startup/bspstart.c b/c/src/lib/libbsp/powerpc/virtex/startup/bspstart.c index ba08fb527a..21b4f5bd47 100644 --- a/c/src/lib/libbsp/powerpc/virtex/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/virtex/startup/bspstart.c @@ -60,8 +60,6 @@ #include #include -#include -#include #include #include #include @@ -94,60 +92,16 @@ bool bsp_timer_internal_clock; /* TRUE, when timer runs with CPU clk */ */ void bsp_XAssertHandler(const char* file, int line); -void bsp_libc_init( void *, uint32_t, int ); - void bsp_XAssertHandler(const char* file, int line) { printf("\n***\n*** XAssert Failed! File: %s, Line: %d\n***\n", file, line); } -/* - * Function: bsp_pretasking_hook - * Created: 95/03/10 - * - * Description: - * BSP pretasking hook. Called just before drivers are initialized. - * Used to setup libc and install any BSP extensions. - * - * NOTES: - * Must not use libc (to do io) from here, since drivers are - * not yet initialized. - * - */ - -void bsp_pretasking_hook(void) -{ - - - uint32_t heap_start; - uint32_t heap_size; - uint32_t heap_end; - - /* round up from the top of workspace to next 64k boundary, get - * default heapsize from linker script */ - heap_start = (((uint32_t)Configuration.work_space_start + - rtems_configuration_get_work_space_size()) + 0x18000) & 0xffff0000; - - heap_end = _heap_start + (uint32_t)&_HeapSize; - - heap_size = (heap_end - heap_start); - - _heap_start = heap_start; - _heap_end = heap_end; - - _top_of_ram = heap_end; - - bsp_libc_init((void *) heap_start, heap_size, 0); /* 64 * 1024 */ - -} - /* * bsp_start * * This routine does the bulk of the system initialization. */ - - void bsp_start( void ) { extern unsigned char IntrStack_start[]; @@ -191,33 +145,6 @@ void bsp_start( void ) * Install our own set of exception vectors */ BSP_rtems_irq_mng_init(0); - - /* - * Allocate the memory for the RTEMS Work Space. This can come from - * a variety of places: hard coded address, malloc'ed from outside - * RTEMS world (e.g. simulator or primitive memory manager), or (as - * typically done by stock BSPs) by subtracting the required amount - * of work space from the last physical address on the CPU board. - */ - - /* - * Need to "allocate" the memory for the RTEMS Workspace and - * tell the RTEMS configuration where it is. This memory is - * not malloc'ed. It is just "pulled from the air". - */ - /* FIME: plan usage of RAM better: - - make top of ram dynamic, - - make rest of ram to heap... - -remove RAM_END from bsp.h, this cannot be valid... - or must be a function call - */ - { - extern int _end; - - /* round _end up to next 64k boundary for start of workspace */ - Configuration.work_space_start = (void *)((((uint32_t)&_end) + 0xffff) & 0xffff0000); - } - } void BSP_ask_for_reset(void) -- cgit v1.2.3