summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2020-02-04 13:20:26 +0100
committerSebastian Huber <sebastian.huber@embedded-brains.de>2020-02-06 15:19:35 +0100
commit1d43a976a83f1b815ec07ce00e3db31fbd36aac4 (patch)
tree40ba82d600d0b97d832b030fa5094755430deeea
parent6fad1f0aba6d7bb21ba7c93d5e9f90733d699daa (diff)
downloadrtems-1d43a976a83f1b815ec07ce00e3db31fbd36aac4.tar.bz2
config: CONFIGURE_ZERO_WORKSPACE_AUTOMATICALLY
Canonicalize CONFIGURE_ZERO_WORKSPACE_AUTOMATICALLY and use defined/undefined instead of TRUE/FALSE. Close #3862.
-rw-r--r--cpukit/include/rtems/confdefs.h15
-rw-r--r--testsuites/sptests/sp54/init.c5
2 files changed, 7 insertions, 13 deletions
diff --git a/cpukit/include/rtems/confdefs.h b/cpukit/include/rtems/confdefs.h
index 0a63dcc461..7d0d3fbeab 100644
--- a/cpukit/include/rtems/confdefs.h
+++ b/cpukit/include/rtems/confdefs.h
@@ -1235,15 +1235,6 @@ extern rtems_initialization_tasks_table Initialization_tasks[];
/**@{*/
/**
- * Should the RTEMS Workspace and C Program Heap be cleared automatically
- * at system start up?
- */
-#ifndef CONFIGURE_ZERO_WORKSPACE_AUTOMATICALLY
- #define CONFIGURE_ZERO_WORKSPACE_AUTOMATICALLY FALSE
-#endif
-/**@}*/ /* end of add to group Configuration */
-
-/**
* @defgroup ConfigurationMalloc RTEMS Malloc configuration
*
* This module contains parameters related to configuration of the RTEMS
@@ -2787,7 +2778,11 @@ struct _reent *__getreent(void)
CONFIGURE_TASK_STACK_ALLOCATOR_INIT, /* stack allocator init */
CONFIGURE_TASK_STACK_ALLOCATOR, /* stack allocator */
CONFIGURE_TASK_STACK_DEALLOCATOR, /* stack deallocator */
- CONFIGURE_ZERO_WORKSPACE_AUTOMATICALLY, /* true to clear memory */
+ #ifdef CONFIGURE_ZERO_WORKSPACE_AUTOMATICALLY /* true to clear memory */
+ true,
+ #else
+ false,
+ #endif
#ifdef CONFIGURE_UNIFIED_WORK_AREAS /* true for unified work areas */
true,
#else
diff --git a/testsuites/sptests/sp54/init.c b/testsuites/sptests/sp54/init.c
index cf7f4dbda4..7bedb46497 100644
--- a/testsuites/sptests/sp54/init.c
+++ b/testsuites/sptests/sp54/init.c
@@ -82,10 +82,9 @@ rtems_initialization_tasks_table Initialization_tasks[1] =
#define CONFIGURE_INIT_TASK_STACK_SIZE 0
/*
- * Ensure we test the case where memory is zero. Not
- * all BSPs will set this to TRUE by default.
+ * Ensure we test the case where memory is zero.
*/
-#define CONFIGURE_ZERO_WORKSPACE_AUTOMATICALLY TRUE
+#define CONFIGURE_ZERO_WORKSPACE_AUTOMATICALLY
#define CONFIGURE_INIT
#include <rtems/confdefs.h>