diff options
Diffstat (limited to 'bsps/nios2')
-rw-r--r-- | bsps/nios2/nios2_iss/clock/clock.c | 2 | ||||
-rw-r--r-- | bsps/nios2/nios2_iss/headers.am | 10 | ||||
-rw-r--r-- | bsps/nios2/nios2_iss/include/bsp.h | 25 | ||||
-rw-r--r-- | bsps/nios2/nios2_iss/start/bsp_specs | 0 | ||||
-rw-r--r-- | bsps/nios2/nios2_iss/start/linkcmds | 2 | ||||
-rw-r--r-- | bsps/nios2/shared/doxygen.h | 8 |
6 files changed, 32 insertions, 15 deletions
diff --git a/bsps/nios2/nios2_iss/clock/clock.c b/bsps/nios2/nios2_iss/clock/clock.c index 5b9b6bb1b5..e22cfcc686 100644 --- a/bsps/nios2/nios2_iss/clock/clock.c +++ b/bsps/nios2/nios2_iss/clock/clock.c @@ -12,7 +12,7 @@ /* * Periodic interval timer interrupt handler */ -#define Clock_driver_support_at_tick() \ +#define Clock_driver_support_at_tick(arg) \ do { CLOCK_REGS->status = 0; } while(0) /* diff --git a/bsps/nios2/nios2_iss/headers.am b/bsps/nios2/nios2_iss/headers.am deleted file mode 100644 index bdd2315266..0000000000 --- a/bsps/nios2/nios2_iss/headers.am +++ /dev/null @@ -1,10 +0,0 @@ -## This file was generated by "./boostrap -H". - -include_HEADERS = -include_HEADERS += ../../../../../../bsps/nios2/nios2_iss/include/bsp.h -include_HEADERS += include/bspopts.h -include_HEADERS += ../../../../../../bsps/nios2/nios2_iss/include/tm27.h - -include_bspdir = $(includedir)/bsp -include_bsp_HEADERS = -include_bsp_HEADERS += ../../../../../../bsps/nios2/nios2_iss/include/bsp/irq.h diff --git a/bsps/nios2/nios2_iss/include/bsp.h b/bsps/nios2/nios2_iss/include/bsp.h index 17a89a0ef9..51c2bc51db 100644 --- a/bsps/nios2/nios2_iss/include/bsp.h +++ b/bsps/nios2/nios2_iss/include/bsp.h @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ + /** * @file * @@ -15,9 +17,26 @@ * COPYRIGHT (c) 1989-1999. * On-Line Applications Research Corporation (OAR). * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.org/license/LICENSE. + * 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. */ #ifndef LIBBSP_NIOS2_NIOS2_ISS_BSP_H diff --git a/bsps/nios2/nios2_iss/start/bsp_specs b/bsps/nios2/nios2_iss/start/bsp_specs deleted file mode 100644 index e69de29bb2..0000000000 --- a/bsps/nios2/nios2_iss/start/bsp_specs +++ /dev/null diff --git a/bsps/nios2/nios2_iss/start/linkcmds b/bsps/nios2/nios2_iss/start/linkcmds index 0aed732ee2..8ea38b5015 100644 --- a/bsps/nios2/nios2_iss/start/linkcmds +++ b/bsps/nios2/nios2_iss/start/linkcmds @@ -268,7 +268,7 @@ SECTIONS } > onchip_memory_0 .noinit (NOLOAD) : { - *(.noinit*) + *(SORT_BY_NAME (SORT_BY_ALIGNMENT (.noinit*))) } > onchip_memory_0 .rtemsstack (NOLOAD) : { diff --git a/bsps/nios2/shared/doxygen.h b/bsps/nios2/shared/doxygen.h index 5dd48fb2b2..b8f3f3a345 100644 --- a/bsps/nios2/shared/doxygen.h +++ b/bsps/nios2/shared/doxygen.h @@ -1,4 +1,12 @@ /** + * @file + * + * @ingroup RTEMSImplDoxygen + * + * @brief This header file defines nios2-specific groups. + */ + +/** * @defgroup RTEMSBSPsNios2 Nios II (nios2) * * @ingroup RTEMSBSPs |