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.

4 files changed, 13 insertions, 24 deletions

diff --git a/cpukit/include/rtems/confdefs.h b/cpukit/include/rtems/confdefs.h
index c044f4842c..2605b513f4 100644
--- a/cpukit/include/rtems/confdefs.h
+++ b/cpukit/include/rtems/confdefs.h
@@ -1260,21 +1260,6 @@ extern rtems_initialization_tasks_table Initialization_tasks[];
 
 #ifdef CONFIGURE_INIT
   /**
-   * By default, RTEMS uses separate heaps for the RTEMS Workspace and
-   * the C Program Heap.  The application can choose optionally to combine
-   * these to provide one larger memory pool. This is particularly
-   * useful in combination with the unlimited objects configuration.
-   */
-  #ifdef CONFIGURE_UNIFIED_WORK_AREAS
-    Heap_Control  *RTEMS_Malloc_Heap = &_Workspace_Area;
-  #else
-    Heap_Control   RTEMS_Malloc_Area;
-    Heap_Control  *RTEMS_Malloc_Heap = &RTEMS_Malloc_Area;
-  #endif
-#endif
-
-#ifdef CONFIGURE_INIT
-  /**
    * This configures the sbrk() support for the malloc family.
    * By default it is assumed that the BSP provides all available
    * RAM to the malloc family implementation so sbrk()'ing to get
diff --git a/cpukit/include/rtems/malloc.h b/cpukit/include/rtems/malloc.h
index 7cdce1f94a..34bdbcb91e 100644
--- a/cpukit/include/rtems/malloc.h
+++ b/cpukit/include/rtems/malloc.h
@@ -19,6 +19,7 @@
 #include <rtems.h>
 #include <rtems/bspIo.h>
 #include <rtems/libcsupport.h> /* for malloc_walk() */
+#include <rtems/score/memory.h>
 
 #include <stdint.h>
 
@@ -43,9 +44,8 @@ extern "C" {
 extern Heap_Control *RTEMS_Malloc_Heap;
 
 void RTEMS_Malloc_Initialize(
-  const Heap_Area *areas,
-  size_t area_count,
-  Heap_Initialization_or_extend_handler extend
+  const Memory_Information              *mem,
+  Heap_Initialization_or_extend_handler  extend
 );
 
 extern ptrdiff_t RTEMS_Malloc_Sbrk_amount;
diff --git a/cpukit/include/rtems/score/wkspace.h b/cpukit/include/rtems/score/wkspace.h
index 8428c9f957..8d0d3bc114 100644
--- a/cpukit/include/rtems/score/wkspace.h
+++ b/cpukit/include/rtems/score/wkspace.h
@@ -24,6 +24,7 @@
 
 #include <rtems/score/heap.h>
 #include <rtems/score/interr.h>
+#include <rtems/score/memory.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -53,14 +54,12 @@ extern Heap_Control _Workspace_Area;
  *
  * This routine performs the initialization necessary for this handler.
  *
- * @param areas The heap area for the new workspace.
- * @param area_count The number of areas for the allocation.
+ * @param mem The memory information
  * @param extend The extension handler for the new workspace.
  */
 void _Workspace_Handler_initialization(
-  Heap_Area *areas,
-  size_t area_count,
-  Heap_Initialization_or_extend_handler extend
+  const Memory_Information              *mem,
+  Heap_Initialization_or_extend_handler  extend
 );
 
 /**
diff --git a/cpukit/include/rtems/sysinit.h b/cpukit/include/rtems/sysinit.h
index 087de59099..7edd313f6c 100644
--- a/cpukit/include/rtems/sysinit.h
+++ b/cpukit/include/rtems/sysinit.h
@@ -28,8 +28,13 @@ extern "C" {
  */
 #define RTEMS_SYSINIT_RECORD                     000100
 #define RTEMS_SYSINIT_BSP_EARLY                  000140
+#define RTEMS_SYSINIT_MEMORY                     000180
+#define RTEMS_SYSINIT_DIRTY_MEMORY               0001c0
 #define RTEMS_SYSINIT_ISR_STACK                  000200
-#define RTEMS_SYSINIT_BSP_WORK_AREAS             000200
+#define RTEMS_SYSINIT_PER_CPU_DATA               000220
+#define RTEMS_SYSINIT_SBRK                       000240
+#define RTEMS_SYSINIT_WORKSPACE                  000260
+#define RTEMS_SYSINIT_MALLOC                     000280
 #define RTEMS_SYSINIT_BSP_START                  000300
 #define RTEMS_SYSINIT_CPU_COUNTER                000400
 #define RTEMS_SYSINIT_INITIAL_EXTENSIONS         000500