Remove all comments and copyrightable content from the moved content. Use BSD-2-Clause license for new file.
Update #3053. Update #3875. --- cpukit/headers.am | 1 + cpukit/include/rtems/confdefs.h | 14 +-------- cpukit/include/rtems/confdefs/bsp.h | 60 +++++++++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 13 deletions(-) create mode 100644 cpukit/include/rtems/confdefs/bsp.h diff --git a/cpukit/headers.am b/cpukit/headers.am index 658444cf9e..9f736e0c87 100644 --- a/cpukit/headers.am +++ b/cpukit/headers.am @@ -183,6 +183,7 @@ include_rtems_HEADERS += include/rtems/userenv.h include_rtems_HEADERS += include/rtems/version.h include_rtems_HEADERS += include/rtems/vmeintr.h include_rtems_HEADERS += include/rtems/watchdogdrv.h +include_rtems_confdefs_HEADERS += include/rtems/confdefs/bsp.h include_rtems_confdefs_HEADERS += include/rtems/confdefs/libpci.h include_rtems_confdefs_HEADERS += include/rtems/confdefs/obsolete.h include_rtems_debugger_HEADERS += include/rtems/debugger/rtems-debugger-bsp.h diff --git a/cpukit/include/rtems/confdefs.h b/cpukit/include/rtems/confdefs.h index b2a10902e4..eca210190c 100644 --- a/cpukit/include/rtems/confdefs.h +++ b/cpukit/include/rtems/confdefs.h @@ -51,23 +51,11 @@ #include <rtems/posix/shm.h> #include <rtems/posix/timer.h> #include <rtems/confdefs/obsolete.h> +#include <rtems/confdefs/bsp.h> #include <rtems/confdefs/libpci.h> #include <limits.h> -#ifdef CONFIGURE_DISABLE_BSP_SETTINGS - #undef BSP_DEFAULT_UNIFIED_WORK_AREAS - #undef BSP_IDLE_TASK_BODY - #undef BSP_IDLE_TASK_STACK_SIZE - #undef BSP_INITIAL_EXTENSION - #undef BSP_INTERRUPT_STACK_SIZE - #undef BSP_MAXIMUM_DEVICES - #undef CONFIGURE_BSP_PREREQUISITE_DRIVERS - #undef CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK -#else - #include <bsp.h> -#endif - #ifdef RTEMS_NEWLIB #include <sys/reent.h> #endif diff --git a/cpukit/include/rtems/confdefs/bsp.h b/cpukit/include/rtems/confdefs/bsp.h new file mode 100644 index 0000000000..7dab15a472 --- /dev/null +++ b/cpukit/include/rtems/confdefs/bsp.h @@ -0,0 +1,60 @@ +/* + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (C) 2013 embedded brains GmbH (http://www.embedded-brains.de) + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +/** + * @file + * + * @ingroup RTEMSApplicationConfiguration + * + * @brief Evaluate BSP Related Configuration Options + */ + +#ifndef _RTEMS_CONFDEFS_BSP_H +#define _RTEMS_CONFDEFS_BSP_H + +#ifndef __CONFIGURATION_TEMPLATE_h +#error "Do not include this file directly, use <rtems/confdefs.h> instead" +#endif + +#ifdef CONFIGURE_INIT + +#ifdef CONFIGURE_DISABLE_BSP_SETTINGS + #undef BSP_DEFAULT_UNIFIED_WORK_AREAS + #undef BSP_IDLE_TASK_BODY + #undef BSP_IDLE_TASK_STACK_SIZE + #undef BSP_INITIAL_EXTENSION + #undef BSP_INTERRUPT_STACK_SIZE + #undef BSP_MAXIMUM_DEVICES + #undef CONFIGURE_BSP_PREREQUISITE_DRIVERS + #undef CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK +#else + #include <bsp.h> +#endif + +#endif /* CONFIGURE_INIT */ + +#endif /* _RTEMS_CONFDEFS_BSP_H */ -- 2.16.4 _______________________________________________ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel