forked from Imagelibrary/rtems
bsps: Rework work area initialization
The work area initialization was done by the BSP through bsp_work_area_initialize(). This approach predated the system initialization through the system initialization linker set. The workspace and C program heap were unconditionally initialized. The aim is to support RTEMS application configurations which do not need the workspace and C program heap. In these configurations, the workspace and C prgram heap should not get initialized. Change all bsp_work_area_initialize() to implement _Memory_Get() instead. Move the dirty memory, sbrk(), per-CPU data, workspace, and malloc() heap initialization into separate system initialization steps. This makes it also easier to test the individual initialization steps. This change adds a dependency to _Heap_Extend() to all BSPs. This dependency will be removed in a follow up change. Update #3838.
This commit is contained in:
@@ -1,8 +1,4 @@
|
||||
/*
|
||||
* This routine is an implementation of the bsp_work_area_initialize()
|
||||
* that can be used by all m68k BSPs following linkcmds conventions
|
||||
* regarding heap, stack, and workspace allocation.
|
||||
*
|
||||
* COPYRIGHT (c) 1989-2008.
|
||||
* On-Line Applications Research Corporation (OAR).
|
||||
*
|
||||
@@ -15,6 +11,8 @@
|
||||
#include <bsp.h>
|
||||
#include <bsp/bootcard.h>
|
||||
|
||||
#include <rtems/sysinit.h>
|
||||
|
||||
#ifdef BSP_GET_WORK_AREA_DEBUG
|
||||
#include <rtems/bspIo.h>
|
||||
#endif
|
||||
@@ -116,17 +114,32 @@ static void bsp_size_memory(void)
|
||||
bsp_mem_size = topAddr;
|
||||
}
|
||||
|
||||
void bsp_work_area_initialize(void)
|
||||
{
|
||||
void *area_start;
|
||||
uintptr_t area_size;
|
||||
static Memory_Area _Memory_Areas[ 1 ];
|
||||
|
||||
static void bsp_memory_initialize( void )
|
||||
{
|
||||
/*
|
||||
* We need to determine how much memory there is in the system.
|
||||
*/
|
||||
bsp_size_memory();
|
||||
|
||||
area_start = (void *) rtemsWorkAreaStart;
|
||||
area_size = (uintptr_t) bsp_mem_size - (uintptr_t) rtemsWorkAreaStart;
|
||||
bsp_work_area_initialize_default( area_start, area_size );
|
||||
_Memory_Initialize_by_size(
|
||||
&_Memory_Areas[0],
|
||||
(void *) rtemsWorkAreaStart,
|
||||
(uintptr_t) bsp_mem_size - (uintptr_t) rtemsWorkAreaStart
|
||||
);
|
||||
}
|
||||
|
||||
RTEMS_SYSINIT_ITEM(
|
||||
bsp_memory_initialize,
|
||||
RTEMS_SYSINIT_MEMORY,
|
||||
RTEMS_SYSINIT_ORDER_MIDDLE
|
||||
);
|
||||
|
||||
static const Memory_Information _Memory_Information =
|
||||
MEMORY_INFORMATION_INITIALIZER( _Memory_Areas );
|
||||
|
||||
const Memory_Information *_Memory_Get( void )
|
||||
{
|
||||
return &_Memory_Information;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user