From 6b0873ffdfd59f163dbb3a64b77dd6604701435d Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Fri, 14 Feb 2020 08:40:41 +0100 Subject: config: Remove CONFIGURE_HAS_OWN_INIT_TASK_TABLE The CONFIGURE_HAS_OWN_INIT_TASK_TABLE and CONFIGURE_POSIX_HAS_OWN_INIT_THREAD_TABLE are the last *_HAS_OWN_* configuration options. These two options are probably unused, see also: * https://lists.rtems.org/pipermail/users/2019-April/033129.html * https://lists.rtems.org/pipermail/users/2019-April/033130.html Removing them simplifies the configuration. If there is a real user need which shows up after the removal, we can resurrect them on demand. Using CONFIGURE_HAS_OWN_INIT_TASK_TABLE would have required the use of the undocumented CONFIGURE_INIT_TASK_TABLE and CONFIGURE_INIT_TASK_TABLE_SIZE configuration options. Update #3873. --- cpukit/include/rtems/confdefs.h | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) (limited to 'cpukit/include/rtems/confdefs.h') diff --git a/cpukit/include/rtems/confdefs.h b/cpukit/include/rtems/confdefs.h index a8fb391496..b5f8de4cd1 100644 --- a/cpukit/include/rtems/confdefs.h +++ b/cpukit/include/rtems/confdefs.h @@ -1290,13 +1290,8 @@ extern rtems_initialization_tasks_table Initialization_tasks[]; * * Default User Initialization Task Table. This table guarantees that * one user initialization table is defined. - * - * WHEN CONFIGURE_HAS_OWN_INIT_TASK_TABLE is defined, the user is - * responsible for defining their own table information and setting the - * appropriate variables. */ -#if defined(CONFIGURE_RTEMS_INIT_TASKS_TABLE) && \ - !defined(CONFIGURE_HAS_OWN_INIT_TASK_TABLE) +#if defined(CONFIGURE_RTEMS_INIT_TASKS_TABLE) /** * When using the default Classic API Initialization Tasks Table, this is @@ -1392,13 +1387,6 @@ extern rtems_initialization_tasks_table Initialization_tasks[]; RTEMS_ARRAY_SIZE(CONFIGURE_INIT_TASK_TABLE) #else /* CONFIGURE_RTEMS_INIT_TASKS_TABLE */ -#ifdef CONFIGURE_HAS_OWN_INIT_TASK_TABLE - -/* - * The user application is responsible for defining everything - * when CONFIGURE_HAS_OWN_INIT_TABLE is defined. - */ -#else /* not using standard or providing own Init Task Table */ /* * This is the name of the Initialization Task when none is configured. @@ -1415,8 +1403,6 @@ extern rtems_initialization_tasks_table Initialization_tasks[]; */ #define CONFIGURE_INIT_TASK_STACK_SIZE 0 -#endif /* CONFIGURE_HAS_OWN_INIT_TASK_TABLE */ - #endif /**@}*/ /* end of Classic API Initialization Tasks Table */ @@ -2792,8 +2778,7 @@ struct _reent *__getreent(void) * then we need to install the code that runs that loop. */ #ifdef CONFIGURE_INIT - #if defined(CONFIGURE_RTEMS_INIT_TASKS_TABLE) || \ - defined(CONFIGURE_HAS_OWN_INIT_TASK_TABLE) + #if defined(CONFIGURE_RTEMS_INIT_TASKS_TABLE) RTEMS_SYSINIT_ITEM( _RTEMS_tasks_Initialize_user_tasks_body, RTEMS_SYSINIT_CLASSIC_USER_TASKS, @@ -2986,6 +2971,10 @@ struct _reent *__getreent(void) #warning "The CONFIGURE_HAS_OWN_FILESYSTEM_TABLE configuration option is obsolete since RTEMS 5.1" #endif +#ifdef CONFIGURE_HAS_OWN_INIT_TABLE + #warning "The CONFIGURE_HAS_OWN_INIT_TABLE configuration option is obsolete since RTEMS 5.1" +#endif + #ifdef CONFIGURE_HAS_OWN_MOUNT_TABLE #warning "The CONFIGURE_HAS_OWN_MOUNT_TABLE configuration option is obsolete since RTEMS 5.1" #endif -- cgit v1.2.3