From eea21eaca117ecd98afea164e1808d6530ef487f Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Fri, 13 Dec 2019 06:18:36 +0100 Subject: 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. --- bsps/arm/imx/start/bspstarthooks.c | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) (limited to 'bsps/arm/imx') diff --git a/bsps/arm/imx/start/bspstarthooks.c b/bsps/arm/imx/start/bspstarthooks.c index 30e03dd788..868da5a192 100644 --- a/bsps/arm/imx/start/bspstarthooks.c +++ b/bsps/arm/imx/start/bspstarthooks.c @@ -22,6 +22,8 @@ #include #include +#include + #include BSP_START_DATA_SECTION static arm_cp15_start_section_config @@ -106,13 +108,27 @@ BSP_START_TEXT_SECTION void bsp_start_hook_1(void) bsp_start_clear_bss(); } -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], + imx_mmu_config_table[ARMV7_CP15_START_WORKSPACE_ENTRY_INDEX].begin, + imx_mmu_config_table[ARMV7_CP15_START_WORKSPACE_ENTRY_INDEX].end + ); +} + +RTEMS_SYSINIT_ITEM( + bsp_memory_initialize, + RTEMS_SYSINIT_MEMORY, + RTEMS_SYSINIT_ORDER_MIDDLE +); - begin = imx_mmu_config_table[ARMV7_CP15_START_WORKSPACE_ENTRY_INDEX].begin; - end = imx_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; } -- cgit v1.2.3