[PATCH 2/2] config: CONFIGURE_ZERO_WORKSPACE_AUTOMATICALLY

[Sebastian Huber]

Canonicalize CONFIGURE_ZERO_WORKSPACE_AUTOMATICALLY and use
defined/undefined instead of TRUE/FALSE.

Close #3862.
---
 cpukit/include/rtems/confdefs.h | 15 +++++----------
 testsuites/sptests/sp54/init.c  |  5 ++---
 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
@@ -1234,15 +1234,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
  *
@@ -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>
-- 
2.16.4