diff --git a/c/src/lib/libbsp/mips/csb350/ChangeLog b/c/src/lib/libbsp/mips/csb350/ChangeLog index 8bdb9afc98..f5c658d713 100644 --- a/c/src/lib/libbsp/mips/csb350/ChangeLog +++ b/c/src/lib/libbsp/mips/csb350/ChangeLog @@ -1,3 +1,10 @@ +2008-09-14 Joel Sherrill + + * Makefile.am, configure.ac, startup/bspstart.c: Split out + bsp_get_work_area() into its own file and user BSP Framework to + perform more initialization. + * startup/bspgetworkarea.c: New file. + 2008-09-10 Joel Sherrill * include/bsp.h: Review of all bsp_cleanup() implementations. In this diff --git a/c/src/lib/libbsp/mips/csb350/Makefile.am b/c/src/lib/libbsp/mips/csb350/Makefile.am index 9dd0535a69..4329d8add4 100644 --- a/c/src/lib/libbsp/mips/csb350/Makefile.am +++ b/c/src/lib/libbsp/mips/csb350/Makefile.am @@ -27,6 +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 \ 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/configure.ac b/c/src/lib/libbsp/mips/csb350/configure.ac index d8cc0f4745..19c76496a3 100644 --- a/c/src/lib/libbsp/mips/csb350/configure.ac +++ b/c/src/lib/libbsp/mips/csb350/configure.ac @@ -18,6 +18,8 @@ RTEMS_PROG_CCAS RTEMS_CHECK_NETWORKING AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") +RTEMS_BSP_BOOTCARD_HANDLES_RAM_ALLOCATION + # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/c/src/lib/libbsp/mips/csb350/startup/bspgetworkarea.c b/c/src/lib/libbsp/mips/csb350/startup/bspgetworkarea.c new file mode 100644 index 0000000000..d8f4be7095 --- /dev/null +++ b/c/src/lib/libbsp/mips/csb350/startup/bspgetworkarea.c @@ -0,0 +1,43 @@ +/* + * 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/bspstart.c b/c/src/lib/libbsp/mips/csb350/startup/bspstart.c index b1c3f25c7d..9c71e95b27 100644 --- a/c/src/lib/libbsp/mips/csb350/startup/bspstart.c +++ b/c/src/lib/libbsp/mips/csb350/startup/bspstart.c @@ -21,75 +21,19 @@ #include #include -/* - * The original table from the application and our copy of it with - * some changes. - */ - -extern void *_sdram_size; -extern void *_sdram_base; -extern void *_bss_free_start; - -unsigned long free_mem_start; -unsigned long free_mem_end; - au1x00_uart_t *uart0 = (au1x00_uart_t *)AU1X00_UART0_ADDR; au1x00_uart_t *uart3 = (au1x00_uart_t *)AU1X00_UART3_ADDR; -/* - * Use the shared implementations of the following routines - */ - -void bsp_libc_init( void *, uint32_t, int ); - -/* - * 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; - - /* - * Set up the heap. - */ - heap_start = free_mem_start; - heap_size = free_mem_end - free_mem_start; - - /* call rtems lib init - malloc stuff */ - bsp_libc_init((void *)heap_start, heap_size, 0); -} - /* * bsp_start * * This routine does the bulk of the system initialization. */ - void bsp_start( void ) { extern void mips_install_isr_entries(void); unsigned int compare = 0; - /* Place RTEMS workspace at beginning of free memory. */ - Configuration.work_space_start = (void *)&_bss_free_start; - - free_mem_start = ((uint32_t)&_bss_free_start + - rtems_configuration_get_work_space_size()); - - free_mem_end = ((uint32_t)&_sdram_base + (uint32_t)&_sdram_size); - mips_set_sr( 0x7f00 ); /* all interrupts unmasked but globally off */ /* depend on the IRC to take care of things */ asm volatile ("mtc0 %0, $11\n" :: "r" (compare));