summaryrefslogtreecommitdiffstats
path: root/cpukit/include/rtems/confdefs
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2020-09-30 11:31:58 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2020-10-01 19:05:33 +0200
commitf2185d109930fb5db31a5c228a3f46178072f270 (patch)
tree166d29b19bcf7ff01b4368f351e3fab52b750c19 /cpukit/include/rtems/confdefs
parentrtems: Canonicalize name and id checks (diff)
downloadrtems-f2185d109930fb5db31a5c228a3f46178072f270.tar.bz2
Decouple the C Program Heap initialization
Before this patch RTEMS_Malloc_Initialize() had a fixed dependency on _Workspace_Area. Introduce _Workspace_Malloc_initializer to have this dependency only if CONFIGURE_UNIFIED_WORK_AREAS is defined by the application configuration.
Diffstat (limited to 'cpukit/include/rtems/confdefs')
-rw-r--r--cpukit/include/rtems/confdefs/wkspace.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/cpukit/include/rtems/confdefs/wkspace.h b/cpukit/include/rtems/confdefs/wkspace.h
index 89d7c21b2a..d40194cbec 100644
--- a/cpukit/include/rtems/confdefs/wkspace.h
+++ b/cpukit/include/rtems/confdefs/wkspace.h
@@ -126,6 +126,9 @@ const uintptr_t _Workspace_Size = CONFIGURE_EXECUTIVE_RAM_SIZE;
#ifdef CONFIGURE_UNIFIED_WORK_AREAS
const bool _Workspace_Is_unified = true;
+
+ struct Heap_Control *( * const _Workspace_Malloc_initializer )( void ) =
+ _Workspace_Malloc_initialize_unified;
#endif
uint32_t rtems_minimum_stack_size = CONFIGURE_MINIMUM_TASK_STACK_SIZE;