Remove CONFIGURE_SMP_APPLICATION

Enable the SMP support if CONFIGURE_SMP_MAXIMUM_PROCESSORS > 1. Update #2893.
2017-02-01 12:11:33 +01:00
parent 70f559d835
commit f95fa38764
54 changed files with 20 additions and 127 deletions
--- a/cpukit/libmisc/dummy/default-configuration.c
+++ b/cpukit/libmisc/dummy/default-configuration.c
@@ -102,8 +102,6 @@ static void Init( rtems_task_argument arg )
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER

-#define CONFIGURE_SMP_APPLICATION
-
 #define CONFIGURE_SMP_MAXIMUM_PROCESSORS 32

 #define CONFIGURE_DISABLE_BSP_SETTINGS
--- a/cpukit/sapi/include/confdefs.h
+++ b/cpukit/sapi/include/confdefs.h
@@ -206,19 +206,20 @@ extern rtems_initialization_tasks_table Initialization_tasks[];
  extern int rtems_telnetd_maximum_ptys;
 #endif

-#if defined(RTEMS_SMP)
-  /*
-   *  If configured for SMP, then we need to know the maximum CPU cores.
-   */
-  #if !defined(CONFIGURE_SMP_APPLICATION)
-    #if !defined(CONFIGURE_SMP_MAXIMUM_PROCESSORS)
-      #define CONFIGURE_SMP_MAXIMUM_PROCESSORS 1
-    #endif
-  #else
-    #if !defined(CONFIGURE_SMP_MAXIMUM_PROCESSORS)
-      #error "CONFIGURE_SMP_MAXIMUM_PROCESSORS not specified for SMP Application"
-    #endif
-  #endif
+#ifndef CONFIGURE_SMP_MAXIMUM_PROCESSORS
+  #define CONFIGURE_SMP_MAXIMUM_PROCESSORS 1
+#endif
+
+/*
+ * An internal define to indicate that this is an SMP application
+ * configuration.
+ */
+#if CONFIGURE_SMP_MAXIMUM_PROCESSORS > 1
+  #define _CONFIGURE_SMP_APPLICATION
+#endif
+
+#ifdef CONFIGURE_SMP_APPLICATION
+  #warning "CONFIGURE_SMP_APPLICATION is obsolete since RTEMS 4.12"
 #endif

 /*
@@ -797,7 +798,7 @@ extern rtems_initialization_tasks_table Initialization_tasks[];
    !defined(CONFIGURE_SCHEDULER_SIMPLE_SMP) && \
    !defined(CONFIGURE_SCHEDULER_EDF) && \
    !defined(CONFIGURE_SCHEDULER_CBS)
-  #if defined(RTEMS_SMP) && defined(CONFIGURE_SMP_APPLICATION)
+  #ifdef _CONFIGURE_SMP_APPLICATION
    /**
     * If no scheduler is specified in an SMP configuration, the
     * priority scheduler is default.
@@ -1499,7 +1500,7 @@ extern rtems_initialization_tasks_table Initialization_tasks[];
 * used to specify the initial execution mode of the single Classic API task.
 */
 #ifndef CONFIGURE_INIT_TASK_INITIAL_MODES
-  #if defined(RTEMS_SMP) && defined(CONFIGURE_SMP_APPLICATION)
+  #ifdef _CONFIGURE_SMP_APPLICATION
    #define CONFIGURE_INIT_TASK_INITIAL_MODES RTEMS_DEFAULT_MODES
  #else
    #define CONFIGURE_INIT_TASK_INITIAL_MODES RTEMS_NO_PREEMPT
@@ -3416,13 +3417,6 @@ extern rtems_initialization_tasks_table Initialization_tasks[];
    #else
      false,
    #endif
-    #ifdef RTEMS_SMP
-      #ifdef CONFIGURE_SMP_APPLICATION
-        true,
-      #else
-        false,
-      #endif
-    #endif
    CONFIGURE_NUMBER_OF_INITIAL_EXTENSIONS,   /* number of static extensions */
    CONFIGURE_INITIAL_EXTENSION_TABLE,        /* pointer to static extensions */
    #if defined(RTEMS_MULTIPROCESSING)
--- a/cpukit/sapi/include/rtems/config.h
+++ b/cpukit/sapi/include/rtems/config.h
@@ -237,10 +237,6 @@ typedef struct {
   */
  bool                           stack_allocator_avoids_work_space;

-  #ifdef RTEMS_SMP
-    bool                         smp_enabled;
-  #endif
-
  uint32_t                       number_of_initial_extensions;
  const rtems_extensions_table  *User_extension_table;
  #if defined(RTEMS_MULTIPROCESSING)
@@ -356,7 +352,7 @@ extern const rtems_configuration_table Configuration;
 * @brief Returns true if the SMP mode of operation is enabled, and false
 * otherwise.
 *
- * On single-processor configurations this is a compile time constant which
+ * In uni-processor configurations this is a compile-time constant which
 * evaluates to false.
 *
 * @retval true SMP mode of operation is enabled.
@@ -364,7 +360,7 @@ extern const rtems_configuration_table Configuration;
 */
 #ifdef RTEMS_SMP
  #define rtems_configuration_is_smp_enabled() \
-        (Configuration.smp_enabled)
+        (rtems_configuration_get_maximum_processors() > 1)
 #else
  #define rtems_configuration_is_smp_enabled() \
        false
--- a/testsuites/smptests/smp01/system.h
+++ b/testsuites/smptests/smp01/system.h
@@ -25,7 +25,6 @@ rtems_task Test_task(
 #define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER

-#define CONFIGURE_SMP_APPLICATION
 #define CONFIGURE_SMP_MAXIMUM_PROCESSORS   4 

 #define CONFIGURE_MAXIMUM_TASKS            \
--- a/testsuites/smptests/smp02/system.h
+++ b/testsuites/smptests/smp02/system.h
@@ -25,7 +25,6 @@ rtems_task Test_task(
 #define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER

-#define CONFIGURE_SMP_APPLICATION
 #define CONFIGURE_SMP_MAXIMUM_PROCESSORS   4 

 #define CONFIGURE_MAXIMUM_TASKS            \
--- a/testsuites/smptests/smp03/system.h
+++ b/testsuites/smptests/smp03/system.h
@@ -25,7 +25,6 @@ rtems_task Test_task(
 #define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER

-#define CONFIGURE_SMP_APPLICATION
 #define CONFIGURE_SMP_MAXIMUM_PROCESSORS   4 

 #define CONFIGURE_MAXIMUM_TASKS            \
--- a/testsuites/smptests/smp05/init.c
+++ b/testsuites/smptests/smp05/init.c
@@ -85,7 +85,6 @@ rtems_task Init(
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER

-#define CONFIGURE_SMP_APPLICATION
 #define CONFIGURE_SMP_MAXIMUM_PROCESSORS   2

 #define CONFIGURE_MAXIMUM_TASKS            \
--- a/testsuites/smptests/smp07/init.c
+++ b/testsuites/smptests/smp07/init.c
@@ -176,7 +176,6 @@ rtems_task Init(
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

-#define CONFIGURE_SMP_APPLICATION
 #define CONFIGURE_SMP_MAXIMUM_PROCESSORS   2
 #define CONFIGURE_MAXIMUM_TIMERS           1

--- a/testsuites/smptests/smp08/system.h
+++ b/testsuites/smptests/smp08/system.h
@@ -27,7 +27,6 @@ rtems_task Test_task(
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER

-#define CONFIGURE_SMP_APPLICATION
 #define CONFIGURE_SMP_MAXIMUM_PROCESSORS   4 

 #define CONFIGURE_MAXIMUM_TASKS            \
--- a/testsuites/smptests/smp09/init.c
+++ b/testsuites/smptests/smp09/init.c
@@ -88,7 +88,6 @@ rtems_task Init(
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER

-#define CONFIGURE_SMP_APPLICATION
 #define CONFIGURE_SMP_MAXIMUM_PROCESSORS   4

 #define CONFIGURE_MAXIMUM_TASKS            \
--- a/testsuites/smptests/smpaffinity01/init.c
+++ b/testsuites/smptests/smpaffinity01/init.c
@@ -227,8 +227,6 @@ static void Init(rtems_task_argument arg)
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER

-#define CONFIGURE_SMP_APPLICATION
-
 #define CONFIGURE_SCHEDULER_PRIORITY_AFFINITY_SMP

 #define CONFIGURE_SMP_MAXIMUM_PROCESSORS NUM_CPUS
--- a/testsuites/smptests/smpatomic01/init.c
+++ b/testsuites/smptests/smpatomic01/init.c
@@ -829,8 +829,6 @@ static void Init(rtems_task_argument arg)

 #define CONFIGURE_MICROSECONDS_PER_TICK (MS_PER_TICK * 1000)

-#define CONFIGURE_SMP_APPLICATION
-
 #define CONFIGURE_SMP_MAXIMUM_PROCESSORS CPU_COUNT

 #define CONFIGURE_MAXIMUM_TASKS CPU_COUNT
--- a/testsuites/smptests/smpcache01/init.c
+++ b/testsuites/smptests/smpcache01/init.c
@@ -268,8 +268,6 @@ static void Init(rtems_task_argument arg)
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER

-#define CONFIGURE_SMP_APPLICATION
-
 #define CONFIGURE_SMP_MAXIMUM_PROCESSORS CPU_COUNT

 #define CONFIGURE_MAXIMUM_TASKS CPU_COUNT
--- a/testsuites/smptests/smpcapture01/init.c
+++ b/testsuites/smptests/smpcapture01/init.c
@@ -251,8 +251,6 @@ static void Init(rtems_task_argument arg)
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER

-#define CONFIGURE_SMP_APPLICATION
-
 #define CONFIGURE_SCHEDULER_PRIORITY_AFFINITY_SMP

 #define CONFIGURE_SMP_MAXIMUM_PROCESSORS NUM_CPUS
--- a/testsuites/smptests/smpcapture02/init.c
+++ b/testsuites/smptests/smpcapture02/init.c
@@ -427,7 +427,6 @@ static void Init(rtems_task_argument arg)
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER

-#define CONFIGURE_SMP_APPLICATION
 #define CONFIGURE_SCHEDULER_PRIORITY_AFFINITY_SMP

 #define CONFIGURE_SMP_MAXIMUM_PROCESSORS MAX_CPUS
--- a/testsuites/smptests/smpclock01/init.c
+++ b/testsuites/smptests/smpclock01/init.c
@@ -174,8 +174,6 @@ static void Init(rtems_task_argument arg)
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER

-#define CONFIGURE_SMP_APPLICATION
-
 #define CONFIGURE_SMP_MAXIMUM_PROCESSORS CPU_COUNT

 #define CONFIGURE_SCHEDULER_SIMPLE_SMP
--- a/testsuites/smptests/smpfatal01/init.c
+++ b/testsuites/smptests/smpfatal01/init.c
@@ -126,8 +126,6 @@ static rtems_status_code test_driver_init(
  { .fatal = fatal_extension }, \
  RTEMS_TEST_INITIAL_EXTENSION

-#define CONFIGURE_SMP_APPLICATION
-
 #define CONFIGURE_SMP_MAXIMUM_PROCESSORS MAX_CPUS

 #define CONFIGURE_MAXIMUM_TASKS 1
--- a/testsuites/smptests/smpfatal02/init.c
+++ b/testsuites/smptests/smpfatal02/init.c
@@ -127,8 +127,6 @@ static rtems_status_code test_driver_init(
  { .fatal = fatal_extension }, \
  RTEMS_TEST_INITIAL_EXTENSION

-#define CONFIGURE_SMP_APPLICATION
-
 #define CONFIGURE_SMP_MAXIMUM_PROCESSORS MAX_CPUS

 #define CONFIGURE_MAXIMUM_TASKS 1
--- a/testsuites/smptests/smpfatal04/init.c
+++ b/testsuites/smptests/smpfatal04/init.c
@@ -56,10 +56,6 @@ static void fatal_extension(
  { .fatal = fatal_extension }, \
  RTEMS_TEST_INITIAL_EXTENSION

-#define CONFIGURE_SMP_APPLICATION
-
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS 1
-
 #define CONFIGURE_SCHEDULER_CONTROLS

 #define CONFIGURE_SMP_SCHEDULER_ASSIGNMENTS RTEMS_SCHEDULER_ASSIGN_NO_SCHEDULER
--- a/testsuites/smptests/smpfatal05/init.c
+++ b/testsuites/smptests/smpfatal05/init.c
@@ -56,8 +56,6 @@ static void fatal_extension(
  { .fatal = fatal_extension }, \
  RTEMS_TEST_INITIAL_EXTENSION

-#define CONFIGURE_SMP_APPLICATION
-
 /* Lets see when the first RTEMS system hits this limit */
 #define CONFIGURE_SMP_MAXIMUM_PROCESSORS 64

--- a/testsuites/smptests/smpfatal06/init.c
+++ b/testsuites/smptests/smpfatal06/init.c
@@ -56,9 +56,7 @@ static void fatal_extension(
  { .fatal = fatal_extension }, \
  RTEMS_TEST_INITIAL_EXTENSION

-#define CONFIGURE_SMP_APPLICATION
-
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS 1
+#define CONFIGURE_SMP_MAXIMUM_PROCESSORS 2

 #define CONFIGURE_MAXIMUM_TASKS 1

--- a/testsuites/smptests/smpfatal08/init.c
+++ b/testsuites/smptests/smpfatal08/init.c
@@ -113,8 +113,6 @@ static void fatal_extension(
  { .fatal = fatal_extension }, \
  RTEMS_TEST_INITIAL_EXTENSION

-#define CONFIGURE_SMP_APPLICATION
-
 #define CONFIGURE_SMP_MAXIMUM_PROCESSORS 2

 #define CONFIGURE_SCHEDULER_SIMPLE_SMP
--- a/testsuites/smptests/smpipi01/init.c
+++ b/testsuites/smptests/smpipi01/init.c
@@ -202,8 +202,6 @@ static void Init(rtems_task_argument arg)
 #define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER

-#define CONFIGURE_SMP_APPLICATION
-
 #define CONFIGURE_SMP_MAXIMUM_PROCESSORS CPU_COUNT

 #define CONFIGURE_MAXIMUM_TASKS 1
--- a/testsuites/smptests/smpload01/init.c
+++ b/testsuites/smptests/smpload01/init.c
@@ -392,8 +392,6 @@ static void Init(rtems_task_argument arg)

 #define CONFIGURE_MICROSECONDS_PER_TICK 1000

-#define CONFIGURE_SMP_APPLICATION
-
 #define CONFIGURE_SMP_MAXIMUM_PROCESSORS CPU_COUNT

 #define CONFIGURE_MAXIMUM_TASKS \
--- a/testsuites/smptests/smplock01/init.c
+++ b/testsuites/smptests/smplock01/init.c
@@ -761,8 +761,6 @@ static void Init(rtems_task_argument arg)
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER

-#define CONFIGURE_SMP_APPLICATION
-
 #define CONFIGURE_SMP_MAXIMUM_PROCESSORS CPU_COUNT

 #define CONFIGURE_MAXIMUM_TASKS CPU_COUNT
--- a/testsuites/smptests/smpmigration01/init.c
+++ b/testsuites/smptests/smpmigration01/init.c
@@ -238,8 +238,6 @@ static void Init(rtems_task_argument arg)
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER

-#define CONFIGURE_SMP_APPLICATION
-
 #define CONFIGURE_SMP_MAXIMUM_PROCESSORS CPU_COUNT

 #define CONFIGURE_MAXIMUM_TASKS (2 + RUNNER_COUNT)
--- a/testsuites/smptests/smpmigration02/init.c
+++ b/testsuites/smptests/smpmigration02/init.c
@@ -281,8 +281,6 @@ static void Init(rtems_task_argument arg)
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER

-#define CONFIGURE_SMP_APPLICATION
-
 #define CONFIGURE_SMP_MAXIMUM_PROCESSORS CPU_COUNT

 #define CONFIGURE_SCHEDULER_SIMPLE_SMP
--- a/testsuites/smptests/smpmrsp01/init.c
+++ b/testsuites/smptests/smpmrsp01/init.c
@@ -1771,8 +1771,6 @@ static void Init(rtems_task_argument arg)
  rtems_test_exit(0);
 }

-#define CONFIGURE_SMP_APPLICATION
-
 #define CONFIGURE_MICROSECONDS_PER_TICK 1000

 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
--- a/testsuites/smptests/smpmutex01/init.c
+++ b/testsuites/smptests/smpmutex01/init.c
@@ -943,8 +943,6 @@ static void Init(rtems_task_argument arg)
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER

-#define CONFIGURE_SMP_APPLICATION
-
 #define CONFIGURE_SMP_MAXIMUM_PROCESSORS PART_COUNT

 #define CONFIGURE_SCHEDULER_SIMPLE_SMP
--- a/testsuites/smptests/smpmutex02/init.c
+++ b/testsuites/smptests/smpmutex02/init.c
@@ -322,8 +322,6 @@ static void Init(rtems_task_argument arg)
 #define CONFIGURE_MAXIMUM_TASKS (1 + WORKER_COUNT)
 #define CONFIGURE_MAXIMUM_SEMAPHORES (1 + MTX_COUNT)

-#define CONFIGURE_SMP_APPLICATION
-
 #define CONFIGURE_SMP_MAXIMUM_PROCESSORS CPU_COUNT

 #define CONFIGURE_SCHEDULER_SIMPLE_SMP
--- a/testsuites/smptests/smppsxaffinity01/init.c
+++ b/testsuites/smptests/smppsxaffinity01/init.c
@@ -161,8 +161,6 @@ void *POSIX_Init(
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER

-#define CONFIGURE_SMP_APPLICATION
-
 #define CONFIGURE_SMP_MAXIMUM_PROCESSORS CPU_COUNT

 #define CONFIGURE_SCHEDULER_PRIORITY_AFFINITY_SMP
--- a/testsuites/smptests/smppsxaffinity02/init.c
+++ b/testsuites/smptests/smppsxaffinity02/init.c
@@ -230,7 +230,6 @@ void *POSIX_Init(
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 #define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER

-#define CONFIGURE_SMP_APPLICATION
 #define CONFIGURE_SCHEDULER_PRIORITY_AFFINITY_SMP

 #define CONFIGURE_SMP_MAXIMUM_PROCESSORS NUM_CPUS
--- a/testsuites/smptests/smppsxmutex01/init.c
+++ b/testsuites/smptests/smppsxmutex01/init.c
@@ -159,8 +159,6 @@ static void *POSIX_Init(void *arg)
 #define CONFIGURE_MAXIMUM_POSIX_THREADS 2
 #define CONFIGURE_MAXIMUM_POSIX_MUTEXES 2

-#define CONFIGURE_SMP_APPLICATION
-
 #define CONFIGURE_SMP_MAXIMUM_PROCESSORS 2

 #define CONFIGURE_SCHEDULER_PRIORITY_SMP
--- a/testsuites/smptests/smppsxsignal01/init.c
+++ b/testsuites/smptests/smppsxsignal01/init.c
@@ -176,8 +176,6 @@ static void *POSIX_Init(void *arg)
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER

-#define CONFIGURE_SMP_APPLICATION
-
 #define CONFIGURE_SMP_MAXIMUM_PROCESSORS 2

 #define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
--- a/testsuites/smptests/smpschedaffinity01/init.c
+++ b/testsuites/smptests/smpschedaffinity01/init.c
@@ -155,8 +155,6 @@ static void Init(rtems_task_argument arg)
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER

-#define CONFIGURE_SMP_APPLICATION
-
 #define CONFIGURE_SCHEDULER_PRIORITY_AFFINITY_SMP

 #define CONFIGURE_SMP_MAXIMUM_PROCESSORS NUM_CPUS
--- a/testsuites/smptests/smpschedaffinity02/init.c
+++ b/testsuites/smptests/smpschedaffinity02/init.c
@@ -209,8 +209,6 @@ static void Init(rtems_task_argument arg)
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER

-#define CONFIGURE_SMP_APPLICATION
-
 #define CONFIGURE_SCHEDULER_PRIORITY_AFFINITY_SMP

 #define CONFIGURE_SMP_MAXIMUM_PROCESSORS NUM_CPUS
--- a/testsuites/smptests/smpschedaffinity03/init.c
+++ b/testsuites/smptests/smpschedaffinity03/init.c
@@ -83,8 +83,6 @@ static void Init(rtems_task_argument arg)
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER

-#define CONFIGURE_SMP_APPLICATION
-
 #define CONFIGURE_SCHEDULER_PRIORITY_AFFINITY_SMP

 #define CONFIGURE_SMP_MAXIMUM_PROCESSORS NUM_CPUS
--- a/testsuites/smptests/smpschedaffinity04/init.c
+++ b/testsuites/smptests/smpschedaffinity04/init.c
@@ -164,8 +164,6 @@ static void Init(rtems_task_argument arg)
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER

-#define CONFIGURE_SMP_APPLICATION
-
 #define CONFIGURE_SCHEDULER_PRIORITY_AFFINITY_SMP

 #define CONFIGURE_SMP_MAXIMUM_PROCESSORS NUM_CPUS
--- a/testsuites/smptests/smpschedaffinity05/init.c
+++ b/testsuites/smptests/smpschedaffinity05/init.c
@@ -223,8 +223,6 @@ static void Init(rtems_task_argument arg)
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER

-#define CONFIGURE_SMP_APPLICATION
-
 #define CONFIGURE_SCHEDULER_PRIORITY_AFFINITY_SMP

 #define CONFIGURE_SMP_MAXIMUM_PROCESSORS NUM_CPUS
--- a/testsuites/smptests/smpschedsem01/init.c
+++ b/testsuites/smptests/smpschedsem01/init.c
@@ -75,8 +75,6 @@ static void Init(rtems_task_argument arg)
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER

-#define CONFIGURE_SMP_APPLICATION
-
 #define CONFIGURE_SCHEDULER_PRIORITY_AFFINITY_SMP

 #define CONFIGURE_SMP_MAXIMUM_PROCESSORS NUM_CPUS
--- a/testsuites/smptests/smpscheduler01/init.c
+++ b/testsuites/smptests/smpscheduler01/init.c
@@ -196,8 +196,6 @@ static void Init(rtems_task_argument arg)
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER

-#define CONFIGURE_SMP_APPLICATION
-
 #define CONFIGURE_SMP_MAXIMUM_PROCESSORS CPU_COUNT

 #define CONFIGURE_MAXIMUM_TASKS TASK_COUNT
--- a/testsuites/smptests/smpscheduler02/init.c
+++ b/testsuites/smptests/smpscheduler02/init.c
@@ -402,8 +402,6 @@ static void Init(rtems_task_argument arg)
 #define CONFIGURE_MAXIMUM_SEMAPHORES 2
 #define CONFIGURE_MAXIMUM_MRSP_SEMAPHORES 1

-#define CONFIGURE_SMP_APPLICATION
-
 /* Lets see when the first RTEMS system hits this limit */
 #define CONFIGURE_SMP_MAXIMUM_PROCESSORS 64

--- a/testsuites/smptests/smpscheduler03/init.c
+++ b/testsuites/smptests/smpscheduler03/init.c
@@ -671,8 +671,6 @@ static void Init(rtems_task_argument arg)
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER

-#define CONFIGURE_SMP_APPLICATION
-
 #define CONFIGURE_SMP_MAXIMUM_PROCESSORS CPU_MAX

 #define CONFIGURE_MAXIMUM_PRIORITY 255
--- a/testsuites/smptests/smpscheduler04/init.c
+++ b/testsuites/smptests/smpscheduler04/init.c
@@ -180,8 +180,6 @@ static void Init(rtems_task_argument arg)

 #define CONFIGURE_MAXIMUM_TASKS 3

-#define CONFIGURE_SMP_APPLICATION
-
 #define CONFIGURE_SMP_MAXIMUM_PROCESSORS CPU_COUNT

 #define CONFIGURE_SCHEDULER_SIMPLE_SMP
--- a/testsuites/smptests/smpsignal01/init.c
+++ b/testsuites/smptests/smpsignal01/init.c
@@ -235,8 +235,6 @@ static void Init(rtems_task_argument arg)
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER

-#define CONFIGURE_SMP_APPLICATION
-
 #define CONFIGURE_SMP_MAXIMUM_PROCESSORS 2

 #define CONFIGURE_MAXIMUM_TASKS 2
--- a/testsuites/smptests/smpstrongapa01/init.c
+++ b/testsuites/smptests/smpstrongapa01/init.c
@@ -332,8 +332,6 @@ static void Init(rtems_task_argument arg)
 #define CONFIGURE_MAXIMUM_TASKS (1 + TASK_COUNT)
 #define CONFIGURE_MAXIMUM_TIMERS 1

-#define CONFIGURE_SMP_APPLICATION
-
 #define CONFIGURE_SMP_MAXIMUM_PROCESSORS CPU_COUNT

 #define CONFIGURE_SCHEDULER_STRONG_APA
--- a/testsuites/smptests/smpswitchextension01/init.c
+++ b/testsuites/smptests/smpswitchextension01/init.c
@@ -236,8 +236,6 @@ static void Init(rtems_task_argument arg)
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER

-#define CONFIGURE_SMP_APPLICATION
-
 #define CONFIGURE_SMP_MAXIMUM_PROCESSORS CPU_COUNT

 #define CONFIGURE_MAXIMUM_TASKS (3 + TOGGLER_COUNT)
--- a/testsuites/smptests/smpthreadlife01/init.c
+++ b/testsuites/smptests/smpthreadlife01/init.c
@@ -506,8 +506,6 @@ static void Init(rtems_task_argument arg)
 #define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER

-#define CONFIGURE_SMP_APPLICATION
-
 #define CONFIGURE_SMP_MAXIMUM_PROCESSORS CPU_COUNT

 #define CONFIGURE_MAXIMUM_TASKS (CPU_COUNT + 1)
--- a/testsuites/smptests/smpunsupported01/init.c
+++ b/testsuites/smptests/smpunsupported01/init.c
@@ -72,9 +72,7 @@ static void Init(rtems_task_argument arg)
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER

-#define CONFIGURE_SMP_APPLICATION
-
-#define CONFIGURE_SMP_MAXIMUM_PROCESSORS 1
+#define CONFIGURE_SMP_MAXIMUM_PROCESSORS 2

 #define CONFIGURE_MAXIMUM_TASKS 2

--- a/testsuites/smptests/smpwakeafter01/init.c
+++ b/testsuites/smptests/smpwakeafter01/init.c
@@ -154,8 +154,6 @@ static void Init(rtems_task_argument arg)

 #define CONFIGURE_MICROSECONDS_PER_TICK 1000

-#define CONFIGURE_SMP_APPLICATION
-
 #define CONFIGURE_SMP_MAXIMUM_PROCESSORS CPU_COUNT

 #define CONFIGURE_MAXIMUM_PRIORITY 255
--- a/testsuites/sptests/sptimecounter02/init.c
+++ b/testsuites/sptests/sptimecounter02/init.c
@@ -257,8 +257,6 @@ static void Init(rtems_task_argument arg)
 #define CONFIGURE_MAXIMUM_TIMERS 2
 #define CONFIGURE_MAXIMUM_PERIODS 1

-#define CONFIGURE_SMP_APPLICATION
-
 #define CONFIGURE_SMP_MAXIMUM_PROCESSORS CPU_COUNT

 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
--- a/testsuites/sptests/sptimecounter03/init.c
+++ b/testsuites/sptests/sptimecounter03/init.c
@@ -97,8 +97,6 @@ static void Init(rtems_task_argument arg)
 #define CONFIGURE_MAXIMUM_TASKS CPU_COUNT
 #define CONFIGURE_MAXIMUM_TIMERS 1

-#define CONFIGURE_SMP_APPLICATION
-
 #define CONFIGURE_SMP_MAXIMUM_PROCESSORS CPU_COUNT

 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
--- a/testsuites/tmtests/tmcontext01/init.c
+++ b/testsuites/tmtests/tmcontext01/init.c
@@ -273,8 +273,6 @@ static void Init(rtems_task_argument arg)

 #define CONFIGURE_INIT_TASK_STACK_SIZE (32 * 1024)

-#define CONFIGURE_SMP_APPLICATION
-
 #define CONFIGURE_SMP_MAXIMUM_PROCESSORS CPU_COUNT

 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
--- a/testsuites/tmtests/tmfine01/init.c
+++ b/testsuites/tmtests/tmfine01/init.c
@@ -512,8 +512,6 @@ static void Init(rtems_task_argument arg)

 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE

-#define CONFIGURE_SMP_APPLICATION
-
 #define CONFIGURE_SMP_MAXIMUM_PROCESSORS CPU_COUNT

 #define CONFIGURE_INIT