Rename CONFIGURE_SMP_MAXIMUM_PROCESSORS

Rename CONFIGURE_SMP_MAXIMUM_PROCESSORS to CONFIGURE_MAXIMUM_PROCESSORS
since the SMP part is superfluous.

Update #2894.

52 files changed, 103 insertions, 102 deletions

diff --git a/cpukit/libmisc/dummy/default-configuration.c b/cpukit/libmisc/dummy/default-configuration.c
index 8d809a0953..5b6da0402f 100644
--- a/cpukit/libmisc/dummy/default-configuration.c
+++ b/cpukit/libmisc/dummy/default-configuration.c
@@ -102,7 +102,7 @@ static void Init( rtems_task_argument arg )
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS 32
+#define CONFIGURE_MAXIMUM_PROCESSORS 32
 
 #define CONFIGURE_DISABLE_BSP_SETTINGS
 
diff --git a/cpukit/sapi/include/confdefs.h b/cpukit/sapi/include/confdefs.h
index 65d5aa63ab..7b7be40985 100755
--- a/cpukit/sapi/include/confdefs.h
+++ b/cpukit/sapi/include/confdefs.h
@@ -211,15 +211,20 @@ extern rtems_initialization_tasks_table Initialization_tasks[];
   extern int rtems_telnetd_maximum_ptys;
 #endif
 
-#ifndef CONFIGURE_SMP_MAXIMUM_PROCESSORS
-  #define CONFIGURE_SMP_MAXIMUM_PROCESSORS 1
+#ifdef CONFIGURE_SMP_MAXIMUM_PROCESSORS
+  #warning "CONFIGURE_SMP_MAXIMUM_PROCESSORS has been renamed to CONFIGURE_MAXIMUM_PROCESSORS since RTEMS 4.12"
+  #define CONFIGURE_MAXIMUM_PROCESSORS CONFIGURE_SMP_MAXIMUM_PROCESSORS
+#endif
+
+#ifndef CONFIGURE_MAXIMUM_PROCESSORS
+  #define CONFIGURE_MAXIMUM_PROCESSORS 1
 #endif
 
 /*
  * An internal define to indicate that this is an SMP application
  * configuration.
  */
-#if defined(RTEMS_SMP) && CONFIGURE_SMP_MAXIMUM_PROCESSORS > 1
+#if defined(RTEMS_SMP) && CONFIGURE_MAXIMUM_PROCESSORS > 1
   #define _CONFIGURE_SMP_APPLICATION
 #endif
 
@@ -1029,97 +1034,97 @@ extern rtems_initialization_tasks_table Initialization_tasks[];
             RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL \
           )
         _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
-        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 2
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 2
           , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
         #endif
-        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 3
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 3
           , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
         #endif
-        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 4
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 4
           , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
         #endif
-        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 5
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 5
           , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
         #endif
-        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 6
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 6
           , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
         #endif
-        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 7
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 7
           , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
         #endif
-        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 8
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 8
           , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
         #endif
-        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 9
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 9
           , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
         #endif
-        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 10
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 10
           , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
         #endif
-        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 11
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 11
           , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
         #endif
-        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 12
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 12
           , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
         #endif
-        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 13
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 13
           , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
         #endif
-        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 14
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 14
           , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
         #endif
-        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 15
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 15
           , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
         #endif
-        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 16
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 16
           , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
         #endif
-        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 17
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 17
           , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
         #endif
-        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 18
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 18
           , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
         #endif
-        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 19
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 19
           , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
         #endif
-        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 20
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 20
           , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
         #endif
-        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 21
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 21
           , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
         #endif
-        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 22
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 22
           , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
         #endif
-        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 23
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 23
           , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
         #endif
-        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 24
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 24
           , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
         #endif
-        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 25
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 25
           , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
         #endif
-        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 26
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 26
           , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
         #endif
-        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 27
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 27
           , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
         #endif
-        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 28
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 28
           , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
         #endif
-        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 29
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 29
           , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
         #endif
-        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 30
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 30
           , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
         #endif
-        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 31
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 31
           , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
         #endif
-        #if CONFIGURE_SMP_MAXIMUM_PROCESSORS >= 32
+        #if CONFIGURE_MAXIMUM_PROCESSORS >= 32
           , _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
         #endif
         #undef _CONFIGURE_SMP_SCHEDULER_ASSIGN_OPT
@@ -1127,7 +1132,7 @@ extern rtems_initialization_tasks_table Initialization_tasks[];
     };
 
     RTEMS_STATIC_ASSERT(
-      CONFIGURE_SMP_MAXIMUM_PROCESSORS
+      CONFIGURE_MAXIMUM_PROCESSORS
         == RTEMS_ARRAY_SIZE( _Scheduler_Initial_assignments ),
       _Scheduler_Initial_assignments
     );
@@ -2909,11 +2914,7 @@ extern rtems_initialization_tasks_table Initialization_tasks[];
  * This calculates the amount of memory reserved for the IDLE tasks.
  * In an SMP system, each CPU core has its own idle task.
  */
-#if defined(RTEMS_SMP)
-  #define _CONFIGURE_IDLE_TASKS_COUNT CONFIGURE_SMP_MAXIMUM_PROCESSORS
-#else
-  #define _CONFIGURE_IDLE_TASKS_COUNT 1
-#endif
+#define _CONFIGURE_IDLE_TASKS_COUNT CONFIGURE_MAXIMUM_PROCESSORS
 
 /**
  * This defines the formula used to compute the amount of memory
@@ -2975,7 +2976,7 @@ extern rtems_initialization_tasks_table Initialization_tasks[];
  */
 #if defined(RTEMS_SMP)
   #define _CONFIGURE_MEMORY_FOR_SMP \
-     (CONFIGURE_SMP_MAXIMUM_PROCESSORS * \
+     (CONFIGURE_MAXIMUM_PROCESSORS * \
       _Configure_From_workspace( CONFIGURE_INTERRUPT_STACK_SIZE ) \
      )
 #else
@@ -3320,7 +3321,7 @@ extern rtems_initialization_tasks_table Initialization_tasks[];
       CONFIGURE_MULTIPROCESSING_TABLE,        /* pointer to MP config table */
     #endif
     #ifdef RTEMS_SMP
-      CONFIGURE_SMP_MAXIMUM_PROCESSORS,
+      CONFIGURE_MAXIMUM_PROCESSORS,
     #endif
   };
 #endif
@@ -3332,7 +3333,7 @@ extern rtems_initialization_tasks_table Initialization_tasks[];
   * Instantiate the Per CPU information based upon the user configuration.
   */
  #if defined(CONFIGURE_INIT)
-   Per_CPU_Control_envelope _Per_CPU_Information[CONFIGURE_SMP_MAXIMUM_PROCESSORS];
+   Per_CPU_Control_envelope _Per_CPU_Information[CONFIGURE_MAXIMUM_PROCESSORS];
  #endif
 
 #endif
diff --git a/testsuites/smptests/smp01/system.h b/testsuites/smptests/smp01/system.h
index 7ced2f69d6..f3f08161aa 100644
--- a/testsuites/smptests/smp01/system.h
+++ b/testsuites/smptests/smp01/system.h
@@ -25,10 +25,10 @@ rtems_task Test_task(
 #define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS   4 
+#define CONFIGURE_MAXIMUM_PROCESSORS   4 
 
 #define CONFIGURE_MAXIMUM_TASKS            \
-    (1 + CONFIGURE_SMP_MAXIMUM_PROCESSORS)
+    (1 + CONFIGURE_MAXIMUM_PROCESSORS)
 #define CONFIGURE_MAXIMUM_SEMAPHORES 1
 
 #define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
@@ -43,7 +43,7 @@ rtems_task Test_task(
  *  Keep the names and IDs in global variables so another task can use them.
  */
 
-TEST_EXTERN volatile bool TaskRan[ CONFIGURE_SMP_MAXIMUM_PROCESSORS ];
+TEST_EXTERN volatile bool TaskRan[ CONFIGURE_MAXIMUM_PROCESSORS ];
 
 void Loop( void );
 
diff --git a/testsuites/smptests/smp02/system.h b/testsuites/smptests/smp02/system.h
index f4923f380d..86d22958cf 100644
--- a/testsuites/smptests/smp02/system.h
+++ b/testsuites/smptests/smp02/system.h
@@ -25,10 +25,10 @@ rtems_task Test_task(
 #define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS   4 
+#define CONFIGURE_MAXIMUM_PROCESSORS   4 
 
 #define CONFIGURE_MAXIMUM_TASKS            \
-    (1 + CONFIGURE_SMP_MAXIMUM_PROCESSORS)
+    (1 + CONFIGURE_MAXIMUM_PROCESSORS)
 
 #define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
 
diff --git a/testsuites/smptests/smp03/system.h b/testsuites/smptests/smp03/system.h
index c15266a471..3d9b067381 100644
--- a/testsuites/smptests/smp03/system.h
+++ b/testsuites/smptests/smp03/system.h
@@ -25,10 +25,10 @@ rtems_task Test_task(
 #define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS   4 
+#define CONFIGURE_MAXIMUM_PROCESSORS   4 
 
 #define CONFIGURE_MAXIMUM_TASKS            \
-    (1 + CONFIGURE_SMP_MAXIMUM_PROCESSORS)
+    (1 + CONFIGURE_MAXIMUM_PROCESSORS)
 
 #define CONFIGURE_MAXIMUM_SEMAPHORES 1
 
@@ -52,7 +52,7 @@ rtems_task Test_task(
  *  Keep the names and IDs in global variables so another task can use them.
  */
 
-TEST_EXTERN volatile bool TaskRan[ CONFIGURE_SMP_MAXIMUM_PROCESSORS + 1 ];
+TEST_EXTERN volatile bool TaskRan[ CONFIGURE_MAXIMUM_PROCESSORS + 1 ];
 
 /*
  *  Keep the names and IDs in global variables so another task can use them.
diff --git a/testsuites/smptests/smp05/init.c b/testsuites/smptests/smp05/init.c
index 4a0ca61fd3..7211e8ca88 100644
--- a/testsuites/smptests/smp05/init.c
+++ b/testsuites/smptests/smp05/init.c
@@ -85,10 +85,10 @@ rtems_task Init(
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER
 
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS   2
+#define CONFIGURE_MAXIMUM_PROCESSORS   2
 
 #define CONFIGURE_MAXIMUM_TASKS            \
-    (1 + CONFIGURE_SMP_MAXIMUM_PROCESSORS)
+    (1 + CONFIGURE_MAXIMUM_PROCESSORS)
 #define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
 
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
diff --git a/testsuites/smptests/smp07/init.c b/testsuites/smptests/smp07/init.c
index 85dba89b12..0dbf70b001 100644
--- a/testsuites/smptests/smp07/init.c
+++ b/testsuites/smptests/smp07/init.c
@@ -176,7 +176,7 @@ rtems_task Init(
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS   2
+#define CONFIGURE_MAXIMUM_PROCESSORS   2
 #define CONFIGURE_MAXIMUM_TIMERS           1
 
 #define CONFIGURE_MAXIMUM_TASKS            2
diff --git a/testsuites/smptests/smp08/system.h b/testsuites/smptests/smp08/system.h
index 63f4b1d638..65209aace1 100644
--- a/testsuites/smptests/smp08/system.h
+++ b/testsuites/smptests/smp08/system.h
@@ -27,10 +27,10 @@ rtems_task Test_task(
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS   4 
+#define CONFIGURE_MAXIMUM_PROCESSORS   4 
 
 #define CONFIGURE_MAXIMUM_TASKS            \
-    (1 + (CONFIGURE_SMP_MAXIMUM_PROCESSORS*3) )
+    (1 + (CONFIGURE_MAXIMUM_PROCESSORS*3) )
 
 #define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
 
diff --git a/testsuites/smptests/smp09/init.c b/testsuites/smptests/smp09/init.c
index 12b6d75529..66290641fd 100644
--- a/testsuites/smptests/smp09/init.c
+++ b/testsuites/smptests/smp09/init.c
@@ -88,10 +88,10 @@ rtems_task Init(
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS   4
+#define CONFIGURE_MAXIMUM_PROCESSORS   4
 
 #define CONFIGURE_MAXIMUM_TASKS            \
-    (1 + CONFIGURE_SMP_MAXIMUM_PROCESSORS)
+    (1 + CONFIGURE_MAXIMUM_PROCESSORS)
 #define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
 
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
diff --git a/testsuites/smptests/smpaffinity01/init.c b/testsuites/smptests/smpaffinity01/init.c
index 2e5fa55d9c..c500cd0e5f 100644
--- a/testsuites/smptests/smpaffinity01/init.c
+++ b/testsuites/smptests/smpaffinity01/init.c
@@ -229,7 +229,7 @@ static void Init(rtems_task_argument arg)
 
 #define CONFIGURE_SCHEDULER_PRIORITY_AFFINITY_SMP
 
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS NUM_CPUS
+#define CONFIGURE_MAXIMUM_PROCESSORS NUM_CPUS
 
 #define CONFIGURE_MAXIMUM_TASKS         (NUM_CPUS*2)
 
diff --git a/testsuites/smptests/smpatomic01/init.c b/testsuites/smptests/smpatomic01/init.c
index 24abbf5cba..394cc3f865 100644
--- a/testsuites/smptests/smpatomic01/init.c
+++ b/testsuites/smptests/smpatomic01/init.c
@@ -829,7 +829,7 @@ static void Init(rtems_task_argument arg)
 
 #define CONFIGURE_MICROSECONDS_PER_TICK (MS_PER_TICK * 1000)
 
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS CPU_COUNT
+#define CONFIGURE_MAXIMUM_PROCESSORS CPU_COUNT
 
 #define CONFIGURE_MAXIMUM_TASKS CPU_COUNT
 
diff --git a/testsuites/smptests/smpcache01/init.c b/testsuites/smptests/smpcache01/init.c
index 7c8617f1f4..851e131a32 100644
--- a/testsuites/smptests/smpcache01/init.c
+++ b/testsuites/smptests/smpcache01/init.c
@@ -268,7 +268,7 @@ static void Init(rtems_task_argument arg)
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS CPU_COUNT
+#define CONFIGURE_MAXIMUM_PROCESSORS CPU_COUNT
 
 #define CONFIGURE_MAXIMUM_TASKS CPU_COUNT
 
diff --git a/testsuites/smptests/smpcapture01/init.c b/testsuites/smptests/smpcapture01/init.c
index 4187e19d1f..aae94e1b22 100644
--- a/testsuites/smptests/smpcapture01/init.c
+++ b/testsuites/smptests/smpcapture01/init.c
@@ -253,7 +253,7 @@ static void Init(rtems_task_argument arg)
 
 #define CONFIGURE_SCHEDULER_PRIORITY_AFFINITY_SMP
 
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS NUM_CPUS
+#define CONFIGURE_MAXIMUM_PROCESSORS NUM_CPUS
 
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
diff --git a/testsuites/smptests/smpcapture02/init.c b/testsuites/smptests/smpcapture02/init.c
index f2b136ad3c..9926fbb493 100644
--- a/testsuites/smptests/smpcapture02/init.c
+++ b/testsuites/smptests/smpcapture02/init.c
@@ -429,7 +429,7 @@ static void Init(rtems_task_argument arg)
 
 #define CONFIGURE_SCHEDULER_PRIORITY_AFFINITY_SMP
 
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS MAX_CPUS
+#define CONFIGURE_MAXIMUM_PROCESSORS MAX_CPUS
 #define CONFIGURE_MAXIMUM_PROCESSORS MAX_CPUS
 #define CONFIGURE_MAXIMUM_SEMAPHORES MAX_CPUS * TASKS_PER_CPU + 1
 #define CONFIGURE_MAXIMUM_TASKS MAX_CPUS * TASKS_PER_CPU + 1
diff --git a/testsuites/smptests/smpclock01/init.c b/testsuites/smptests/smpclock01/init.c
index 120a07904c..5972959b66 100644
--- a/testsuites/smptests/smpclock01/init.c
+++ b/testsuites/smptests/smpclock01/init.c
@@ -174,7 +174,7 @@ static void Init(rtems_task_argument arg)
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS CPU_COUNT
+#define CONFIGURE_MAXIMUM_PROCESSORS CPU_COUNT
 
 #define CONFIGURE_SCHEDULER_SIMPLE_SMP
 
diff --git a/testsuites/smptests/smpfatal01/init.c b/testsuites/smptests/smpfatal01/init.c
index 271062972f..2a000a5bf8 100644
--- a/testsuites/smptests/smpfatal01/init.c
+++ b/testsuites/smptests/smpfatal01/init.c
@@ -126,7 +126,7 @@ static rtems_status_code test_driver_init(
   { .fatal = fatal_extension }, \
   RTEMS_TEST_INITIAL_EXTENSION
 
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS MAX_CPUS
+#define CONFIGURE_MAXIMUM_PROCESSORS MAX_CPUS
 
 #define CONFIGURE_MAXIMUM_TASKS 1
 
diff --git a/testsuites/smptests/smpfatal02/init.c b/testsuites/smptests/smpfatal02/init.c
index 7d8d541f6f..fc25808d56 100644
--- a/testsuites/smptests/smpfatal02/init.c
+++ b/testsuites/smptests/smpfatal02/init.c
@@ -127,7 +127,7 @@ static rtems_status_code test_driver_init(
   { .fatal = fatal_extension }, \
   RTEMS_TEST_INITIAL_EXTENSION
 
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS MAX_CPUS
+#define CONFIGURE_MAXIMUM_PROCESSORS MAX_CPUS
 
 #define CONFIGURE_MAXIMUM_TASKS 1
 
diff --git a/testsuites/smptests/smpfatal05/init.c b/testsuites/smptests/smpfatal05/init.c
index bbafb5e7ae..6b0954a7bb 100644
--- a/testsuites/smptests/smpfatal05/init.c
+++ b/testsuites/smptests/smpfatal05/init.c
@@ -57,7 +57,7 @@ static void fatal_extension(
   RTEMS_TEST_INITIAL_EXTENSION
 
 /* Lets see when the first RTEMS system hits this limit */
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS 64
+#define CONFIGURE_MAXIMUM_PROCESSORS 64
 
 #define CONFIGURE_SCHEDULER_SIMPLE_SMP
 
diff --git a/testsuites/smptests/smpfatal06/init.c b/testsuites/smptests/smpfatal06/init.c
index 4fb4074174..37cd9afe5a 100644
--- a/testsuites/smptests/smpfatal06/init.c
+++ b/testsuites/smptests/smpfatal06/init.c
@@ -56,7 +56,7 @@ static void fatal_extension(
   { .fatal = fatal_extension }, \
   RTEMS_TEST_INITIAL_EXTENSION
 
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS 2
+#define CONFIGURE_MAXIMUM_PROCESSORS 2
 
 #define CONFIGURE_MAXIMUM_TASKS 1
 
diff --git a/testsuites/smptests/smpfatal08/init.c b/testsuites/smptests/smpfatal08/init.c
index fd738d5922..92f769a704 100644
--- a/testsuites/smptests/smpfatal08/init.c
+++ b/testsuites/smptests/smpfatal08/init.c
@@ -113,7 +113,7 @@ static void fatal_extension(
   { .fatal = fatal_extension }, \
   RTEMS_TEST_INITIAL_EXTENSION
 
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS 2
+#define CONFIGURE_MAXIMUM_PROCESSORS 2
 
 #define CONFIGURE_SCHEDULER_SIMPLE_SMP
 
diff --git a/testsuites/smptests/smpipi01/init.c b/testsuites/smptests/smpipi01/init.c
index 8879296cbd..679b059de0 100644
--- a/testsuites/smptests/smpipi01/init.c
+++ b/testsuites/smptests/smpipi01/init.c
@@ -202,7 +202,7 @@ static void Init(rtems_task_argument arg)
 #define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS CPU_COUNT
+#define CONFIGURE_MAXIMUM_PROCESSORS CPU_COUNT
 
 #define CONFIGURE_MAXIMUM_TASKS 1
 
diff --git a/testsuites/smptests/smpload01/init.c b/testsuites/smptests/smpload01/init.c
index bcce1d9257..0e102354d4 100644
--- a/testsuites/smptests/smpload01/init.c
+++ b/testsuites/smptests/smpload01/init.c
@@ -392,7 +392,7 @@ static void Init(rtems_task_argument arg)
 
 #define CONFIGURE_MICROSECONDS_PER_TICK 1000
 
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS CPU_COUNT
+#define CONFIGURE_MAXIMUM_PROCESSORS CPU_COUNT
 
 #define CONFIGURE_MAXIMUM_TASKS \
   (1 + MAX_INHERIT_OBTAIN_COUNT + 1 + 1 + SEM_WORKER_COUNT)
diff --git a/testsuites/smptests/smplock01/init.c b/testsuites/smptests/smplock01/init.c
index ac7e9e24aa..0a379154f5 100644
--- a/testsuites/smptests/smplock01/init.c
+++ b/testsuites/smptests/smplock01/init.c
@@ -761,7 +761,7 @@ static void Init(rtems_task_argument arg)
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS CPU_COUNT
+#define CONFIGURE_MAXIMUM_PROCESSORS CPU_COUNT
 
 #define CONFIGURE_MAXIMUM_TASKS CPU_COUNT
 
diff --git a/testsuites/smptests/smpmigration01/init.c b/testsuites/smptests/smpmigration01/init.c
index 7ad1e93493..6cde34b234 100644
--- a/testsuites/smptests/smpmigration01/init.c
+++ b/testsuites/smptests/smpmigration01/init.c
@@ -238,7 +238,7 @@ static void Init(rtems_task_argument arg)
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS CPU_COUNT
+#define CONFIGURE_MAXIMUM_PROCESSORS CPU_COUNT
 
 #define CONFIGURE_MAXIMUM_TASKS (2 + RUNNER_COUNT)
 
diff --git a/testsuites/smptests/smpmigration02/init.c b/testsuites/smptests/smpmigration02/init.c
index bfba962911..4180f5387f 100644
--- a/testsuites/smptests/smpmigration02/init.c
+++ b/testsuites/smptests/smpmigration02/init.c
@@ -281,7 +281,7 @@ static void Init(rtems_task_argument arg)
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS CPU_COUNT
+#define CONFIGURE_MAXIMUM_PROCESSORS CPU_COUNT
 
 #define CONFIGURE_SCHEDULER_SIMPLE_SMP
 
diff --git a/testsuites/smptests/smpmrsp01/init.c b/testsuites/smptests/smpmrsp01/init.c
index 2690618b1e..cc955678b6 100644
--- a/testsuites/smptests/smpmrsp01/init.c
+++ b/testsuites/smptests/smpmrsp01/init.c
@@ -1781,7 +1781,7 @@ static void Init(rtems_task_argument arg)
 #define CONFIGURE_MAXIMUM_MRSP_SEMAPHORES MRSP_COUNT
 #define CONFIGURE_MAXIMUM_TIMERS 1
 
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS CPU_COUNT
+#define CONFIGURE_MAXIMUM_PROCESSORS CPU_COUNT
 
 #define CONFIGURE_SCHEDULER_SIMPLE_SMP
 
diff --git a/testsuites/smptests/smpmutex01/init.c b/testsuites/smptests/smpmutex01/init.c
index 46c0bf3f0b..c7059e8e14 100644
--- a/testsuites/smptests/smpmutex01/init.c
+++ b/testsuites/smptests/smpmutex01/init.c
@@ -943,7 +943,7 @@ static void Init(rtems_task_argument arg)
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS PART_COUNT
+#define CONFIGURE_MAXIMUM_PROCESSORS PART_COUNT
 
 #define CONFIGURE_SCHEDULER_SIMPLE_SMP
 
diff --git a/testsuites/smptests/smpmutex02/init.c b/testsuites/smptests/smpmutex02/init.c
index 09e61e195a..1604bb7cf8 100644
--- a/testsuites/smptests/smpmutex02/init.c
+++ b/testsuites/smptests/smpmutex02/init.c
@@ -322,7 +322,7 @@ static void Init(rtems_task_argument arg)
 #define CONFIGURE_MAXIMUM_TASKS (1 + WORKER_COUNT)
 #define CONFIGURE_MAXIMUM_SEMAPHORES (1 + MTX_COUNT)
 
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS CPU_COUNT
+#define CONFIGURE_MAXIMUM_PROCESSORS CPU_COUNT
 
 #define CONFIGURE_SCHEDULER_SIMPLE_SMP
 
diff --git a/testsuites/smptests/smppsxaffinity01/init.c b/testsuites/smptests/smppsxaffinity01/init.c
index 89b29f511c..c4c4f4f7c3 100644
--- a/testsuites/smptests/smppsxaffinity01/init.c
+++ b/testsuites/smptests/smppsxaffinity01/init.c
@@ -161,7 +161,7 @@ void *POSIX_Init(
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER
 
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS CPU_COUNT
+#define CONFIGURE_MAXIMUM_PROCESSORS CPU_COUNT
 
 #define CONFIGURE_SCHEDULER_PRIORITY_AFFINITY_SMP
 
diff --git a/testsuites/smptests/smppsxaffinity02/init.c b/testsuites/smptests/smppsxaffinity02/init.c
index 54d3eadbbc..e8acfb1b21 100644
--- a/testsuites/smptests/smppsxaffinity02/init.c
+++ b/testsuites/smptests/smppsxaffinity02/init.c
@@ -232,7 +232,7 @@ void *POSIX_Init(
 
 #define CONFIGURE_SCHEDULER_PRIORITY_AFFINITY_SMP
 
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS NUM_CPUS
+#define CONFIGURE_MAXIMUM_PROCESSORS NUM_CPUS
 
 #define CONFIGURE_MAXIMUM_POSIX_THREADS (NUM_CPUS*2)
 
diff --git a/testsuites/smptests/smppsxmutex01/init.c b/testsuites/smptests/smppsxmutex01/init.c
index 8f19b6e743..3ed22b107e 100644
--- a/testsuites/smptests/smppsxmutex01/init.c
+++ b/testsuites/smptests/smppsxmutex01/init.c
@@ -159,7 +159,7 @@ static void *POSIX_Init(void *arg)
 #define CONFIGURE_MAXIMUM_POSIX_THREADS 2
 #define CONFIGURE_MAXIMUM_POSIX_MUTEXES 2
 
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS 2
+#define CONFIGURE_MAXIMUM_PROCESSORS 2
 
 #define CONFIGURE_SCHEDULER_PRIORITY_SMP
 
diff --git a/testsuites/smptests/smppsxsignal01/init.c b/testsuites/smptests/smppsxsignal01/init.c
index 9299292c38..367615838c 100644
--- a/testsuites/smptests/smppsxsignal01/init.c
+++ b/testsuites/smptests/smppsxsignal01/init.c
@@ -176,7 +176,7 @@ static void *POSIX_Init(void *arg)
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS 2
+#define CONFIGURE_MAXIMUM_PROCESSORS 2
 
 #define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
 
diff --git a/testsuites/smptests/smpschedaffinity01/init.c b/testsuites/smptests/smpschedaffinity01/init.c
index a653f469a8..778fda7ba0 100644
--- a/testsuites/smptests/smpschedaffinity01/init.c
+++ b/testsuites/smptests/smpschedaffinity01/init.c
@@ -157,7 +157,7 @@ static void Init(rtems_task_argument arg)
 
 #define CONFIGURE_SCHEDULER_PRIORITY_AFFINITY_SMP
 
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS NUM_CPUS
+#define CONFIGURE_MAXIMUM_PROCESSORS NUM_CPUS
 
 #define CONFIGURE_MAXIMUM_TASKS          TASK_COUNT
 
diff --git a/testsuites/smptests/smpschedaffinity02/init.c b/testsuites/smptests/smpschedaffinity02/init.c
index fe55bc09c6..9a8cfed7dd 100644
--- a/testsuites/smptests/smpschedaffinity02/init.c
+++ b/testsuites/smptests/smpschedaffinity02/init.c
@@ -211,7 +211,7 @@ static void Init(rtems_task_argument arg)
 
 #define CONFIGURE_SCHEDULER_PRIORITY_AFFINITY_SMP
 
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS NUM_CPUS
+#define CONFIGURE_MAXIMUM_PROCESSORS NUM_CPUS
 
 #define CONFIGURE_MAXIMUM_TASKS          NUM_CPUS
 
diff --git a/testsuites/smptests/smpschedaffinity03/init.c b/testsuites/smptests/smpschedaffinity03/init.c
index 04ed4ec4f2..a53b30caa7 100644
--- a/testsuites/smptests/smpschedaffinity03/init.c
+++ b/testsuites/smptests/smpschedaffinity03/init.c
@@ -85,7 +85,7 @@ static void Init(rtems_task_argument arg)
 
 #define CONFIGURE_SCHEDULER_PRIORITY_AFFINITY_SMP
 
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS NUM_CPUS
+#define CONFIGURE_MAXIMUM_PROCESSORS NUM_CPUS
 
 #define CONFIGURE_MAXIMUM_TASKS          TASK_COUNT
 
diff --git a/testsuites/smptests/smpschedaffinity04/init.c b/testsuites/smptests/smpschedaffinity04/init.c
index a2066ad542..e4df282a54 100644
--- a/testsuites/smptests/smpschedaffinity04/init.c
+++ b/testsuites/smptests/smpschedaffinity04/init.c
@@ -166,7 +166,7 @@ static void Init(rtems_task_argument arg)
 
 #define CONFIGURE_SCHEDULER_PRIORITY_AFFINITY_SMP
 
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS NUM_CPUS
+#define CONFIGURE_MAXIMUM_PROCESSORS NUM_CPUS
 
 #define CONFIGURE_MAXIMUM_TASKS          TASK_COUNT
 
diff --git a/testsuites/smptests/smpschedaffinity05/init.c b/testsuites/smptests/smpschedaffinity05/init.c
index be0aa316f8..b89a6e29d8 100644
--- a/testsuites/smptests/smpschedaffinity05/init.c
+++ b/testsuites/smptests/smpschedaffinity05/init.c
@@ -226,7 +226,7 @@ static void Init(rtems_task_argument arg)
 
 #define CONFIGURE_SCHEDULER_PRIORITY_AFFINITY_SMP
 
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS NUM_CPUS
+#define CONFIGURE_MAXIMUM_PROCESSORS NUM_CPUS
 
 #define CONFIGURE_MAXIMUM_TASKS          TASK_COUNT
 
diff --git a/testsuites/smptests/smpschedsem01/init.c b/testsuites/smptests/smpschedsem01/init.c
index 04d8a983bf..cae5d6e84a 100644
--- a/testsuites/smptests/smpschedsem01/init.c
+++ b/testsuites/smptests/smpschedsem01/init.c
@@ -77,7 +77,7 @@ static void Init(rtems_task_argument arg)
 
 #define CONFIGURE_SCHEDULER_PRIORITY_AFFINITY_SMP
 
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS NUM_CPUS
+#define CONFIGURE_MAXIMUM_PROCESSORS NUM_CPUS
 
 #define CONFIGURE_MAXIMUM_TASKS          TASK_COUNT
 
diff --git a/testsuites/smptests/smpscheduler01/init.c b/testsuites/smptests/smpscheduler01/init.c
index 734ab8b4c8..5b8744c68e 100644
--- a/testsuites/smptests/smpscheduler01/init.c
+++ b/testsuites/smptests/smpscheduler01/init.c
@@ -196,7 +196,7 @@ static void Init(rtems_task_argument arg)
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS CPU_COUNT
+#define CONFIGURE_MAXIMUM_PROCESSORS CPU_COUNT
 
 #define CONFIGURE_MAXIMUM_TASKS TASK_COUNT
 
diff --git a/testsuites/smptests/smpscheduler02/init.c b/testsuites/smptests/smpscheduler02/init.c
index 5ef8de1cf4..43558579ab 100644
--- a/testsuites/smptests/smpscheduler02/init.c
+++ b/testsuites/smptests/smpscheduler02/init.c
@@ -403,7 +403,7 @@ static void Init(rtems_task_argument arg)
 #define CONFIGURE_MAXIMUM_MRSP_SEMAPHORES 1
 
 /* Lets see when the first RTEMS system hits this limit */
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS 64
+#define CONFIGURE_MAXIMUM_PROCESSORS 64
 
 #define CONFIGURE_SCHEDULER_PRIORITY_SMP
 #define CONFIGURE_SCHEDULER_SIMPLE_SMP
diff --git a/testsuites/smptests/smpscheduler03/init.c b/testsuites/smptests/smpscheduler03/init.c
index e4aa9855bd..3180c9526a 100644
--- a/testsuites/smptests/smpscheduler03/init.c
+++ b/testsuites/smptests/smpscheduler03/init.c
@@ -657,7 +657,7 @@ static void Init(rtems_task_argument arg)
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS CPU_MAX
+#define CONFIGURE_MAXIMUM_PROCESSORS CPU_MAX
 
 #define CONFIGURE_MAXIMUM_PRIORITY 255
 
diff --git a/testsuites/smptests/smpscheduler04/init.c b/testsuites/smptests/smpscheduler04/init.c
index b87edc9f4c..a4e9da1289 100644
--- a/testsuites/smptests/smpscheduler04/init.c
+++ b/testsuites/smptests/smpscheduler04/init.c
@@ -180,7 +180,7 @@ static void Init(rtems_task_argument arg)
 
 #define CONFIGURE_MAXIMUM_TASKS 3
 
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS CPU_COUNT
+#define CONFIGURE_MAXIMUM_PROCESSORS CPU_COUNT
 
 #define CONFIGURE_SCHEDULER_SIMPLE_SMP
 
diff --git a/testsuites/smptests/smpsignal01/init.c b/testsuites/smptests/smpsignal01/init.c
index 220ae330c2..52f2edbddd 100644
--- a/testsuites/smptests/smpsignal01/init.c
+++ b/testsuites/smptests/smpsignal01/init.c
@@ -235,7 +235,7 @@ static void Init(rtems_task_argument arg)
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS 2
+#define CONFIGURE_MAXIMUM_PROCESSORS 2
 
 #define CONFIGURE_MAXIMUM_TASKS 2
 
diff --git a/testsuites/smptests/smpstrongapa01/init.c b/testsuites/smptests/smpstrongapa01/init.c
index 9452583977..16ef6e4723 100644
--- a/testsuites/smptests/smpstrongapa01/init.c
+++ b/testsuites/smptests/smpstrongapa01/init.c
@@ -332,7 +332,7 @@ static void Init(rtems_task_argument arg)
 #define CONFIGURE_MAXIMUM_TASKS (1 + TASK_COUNT)
 #define CONFIGURE_MAXIMUM_TIMERS 1
 
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS CPU_COUNT
+#define CONFIGURE_MAXIMUM_PROCESSORS CPU_COUNT
 
 #define CONFIGURE_SCHEDULER_STRONG_APA
 
diff --git a/testsuites/smptests/smpswitchextension01/init.c b/testsuites/smptests/smpswitchextension01/init.c
index a67409bb34..3fad1d927c 100644
--- a/testsuites/smptests/smpswitchextension01/init.c
+++ b/testsuites/smptests/smpswitchextension01/init.c
@@ -236,7 +236,7 @@ static void Init(rtems_task_argument arg)
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS CPU_COUNT
+#define CONFIGURE_MAXIMUM_PROCESSORS CPU_COUNT
 
 #define CONFIGURE_MAXIMUM_TASKS (3 + TOGGLER_COUNT)
 
diff --git a/testsuites/smptests/smpthreadlife01/init.c b/testsuites/smptests/smpthreadlife01/init.c
index b85ad567dd..5c2d106d0f 100644
--- a/testsuites/smptests/smpthreadlife01/init.c
+++ b/testsuites/smptests/smpthreadlife01/init.c
@@ -506,7 +506,7 @@ static void Init(rtems_task_argument arg)
 #define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS CPU_COUNT
+#define CONFIGURE_MAXIMUM_PROCESSORS CPU_COUNT
 
 #define CONFIGURE_MAXIMUM_TASKS (CPU_COUNT + 1)
 
diff --git a/testsuites/smptests/smpunsupported01/init.c b/testsuites/smptests/smpunsupported01/init.c
index 434de25fb1..a5ccaae271 100644
--- a/testsuites/smptests/smpunsupported01/init.c
+++ b/testsuites/smptests/smpunsupported01/init.c
@@ -72,7 +72,7 @@ static void Init(rtems_task_argument arg)
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS 2
+#define CONFIGURE_MAXIMUM_PROCESSORS 2
 
 #define CONFIGURE_MAXIMUM_TASKS 2
 
diff --git a/testsuites/smptests/smpwakeafter01/init.c b/testsuites/smptests/smpwakeafter01/init.c
index 6038d98e6d..3d091f59c0 100644
--- a/testsuites/smptests/smpwakeafter01/init.c
+++ b/testsuites/smptests/smpwakeafter01/init.c
@@ -154,7 +154,7 @@ static void Init(rtems_task_argument arg)
 
 #define CONFIGURE_MICROSECONDS_PER_TICK 1000
 
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS CPU_COUNT
+#define CONFIGURE_MAXIMUM_PROCESSORS CPU_COUNT
 
 #define CONFIGURE_MAXIMUM_PRIORITY 255
 
diff --git a/testsuites/sptests/sptimecounter02/init.c b/testsuites/sptests/sptimecounter02/init.c
index 31597253fe..4f8de6a034 100644
--- a/testsuites/sptests/sptimecounter02/init.c
+++ b/testsuites/sptests/sptimecounter02/init.c
@@ -257,7 +257,7 @@ static void Init(rtems_task_argument arg)
 #define CONFIGURE_MAXIMUM_TIMERS 2
 #define CONFIGURE_MAXIMUM_PERIODS 1
 
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS CPU_COUNT
+#define CONFIGURE_MAXIMUM_PROCESSORS CPU_COUNT
 
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
diff --git a/testsuites/sptests/sptimecounter03/init.c b/testsuites/sptests/sptimecounter03/init.c
index bcfb71a9db..3b57d95a12 100644
--- a/testsuites/sptests/sptimecounter03/init.c
+++ b/testsuites/sptests/sptimecounter03/init.c
@@ -97,7 +97,7 @@ static void Init(rtems_task_argument arg)
 #define CONFIGURE_MAXIMUM_TASKS CPU_COUNT
 #define CONFIGURE_MAXIMUM_TIMERS 1
 
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS CPU_COUNT
+#define CONFIGURE_MAXIMUM_PROCESSORS CPU_COUNT
 
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
diff --git a/testsuites/tmtests/tmcontext01/init.c b/testsuites/tmtests/tmcontext01/init.c
index e5593a60c8..c368d795d8 100644
--- a/testsuites/tmtests/tmcontext01/init.c
+++ b/testsuites/tmtests/tmcontext01/init.c
@@ -273,7 +273,7 @@ static void Init(rtems_task_argument arg)
 
 #define CONFIGURE_INIT_TASK_STACK_SIZE (32 * 1024)
 
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS CPU_COUNT
+#define CONFIGURE_MAXIMUM_PROCESSORS CPU_COUNT
 
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
diff --git a/testsuites/tmtests/tmfine01/init.c b/testsuites/tmtests/tmfine01/init.c
index 16a7e6ec4c..6841b02e59 100644
--- a/testsuites/tmtests/tmfine01/init.c
+++ b/testsuites/tmtests/tmfine01/init.c
@@ -512,7 +512,7 @@ static void Init(rtems_task_argument arg)
 
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS CPU_COUNT
+#define CONFIGURE_MAXIMUM_PROCESSORS CPU_COUNT
 
 #define CONFIGURE_INIT