diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2019-12-13 06:18:36 +0100 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2020-02-04 06:06:41 +0100 |
commit | eea21eaca117ecd98afea164e1808d6530ef487f (patch) | |
tree | ca4e15da28b71a5ecca5fc357798261a39b3f250 /bsps/arm/raspberrypi | |
parent | bsps: Remove uses of BSP_GET_WORK_AREA_DEBUG (diff) | |
download | rtems-eea21eaca117ecd98afea164e1808d6530ef487f.tar.bz2 |
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.
Diffstat (limited to 'bsps/arm/raspberrypi')
-rw-r--r-- | bsps/arm/raspberrypi/start/bspstarthooks.c | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/bsps/arm/raspberrypi/start/bspstarthooks.c b/bsps/arm/raspberrypi/start/bspstarthooks.c index c2a9707d71..fd6aa53059 100644 --- a/bsps/arm/raspberrypi/start/bspstarthooks.c +++ b/bsps/arm/raspberrypi/start/bspstarthooks.c @@ -31,6 +31,8 @@ #include <bsp/linker-symbols.h> #include <bsp/arm-cp15-start.h> +#include <rtems/sysinit.h> + #ifdef RTEMS_SMP #include <rtems/score/smp.h> #endif @@ -176,15 +178,27 @@ void BSP_START_TEXT_SECTION bsp_start_hook_1(void) rpi_video_init(); } -void bsp_work_area_initialize(void) +static Memory_Area _Memory_Areas[1]; + +static void bsp_memory_initialize(void) { - uintptr_t begin; - uintptr_t end; + _Memory_Initialize( + &_Memory_Areas[0], + raspberrypi_mmu_config_table[ARMV7_CP15_START_WORKSPACE_ENTRY_INDEX].begin, + raspberrypi_mmu_config_table[ARMV7_CP15_START_WORKSPACE_ENTRY_INDEX].end + ); +} + +RTEMS_SYSINIT_ITEM( + bsp_memory_initialize, + RTEMS_SYSINIT_MEMORY, + RTEMS_SYSINIT_ORDER_MIDDLE +); - begin = raspberrypi_mmu_config_table[ARMV7_CP15_START_WORKSPACE_ENTRY_INDEX] - .begin; - end = raspberrypi_mmu_config_table[ARMV7_CP15_START_WORKSPACE_ENTRY_INDEX] - .end; +static const Memory_Information _Memory_Information = + MEMORY_INFORMATION_INITIALIZER(_Memory_Areas); - bsp_work_area_initialize_default((void *) begin, end - begin); +const Memory_Information *_Memory_Get(void) +{ + return &_Memory_Information; } |