diff options
Diffstat (limited to 'bsps/powerpc/virtex5')
-rw-r--r-- | bsps/powerpc/virtex5/headers.am | 11 | ||||
-rw-r--r-- | bsps/powerpc/virtex5/include/bsp.h | 2 | ||||
-rw-r--r-- | bsps/powerpc/virtex5/include/bsp/irq.h | 51 | ||||
-rw-r--r-- | bsps/powerpc/virtex5/irq/irq_init.c | 54 | ||||
-rw-r--r-- | bsps/powerpc/virtex5/start/bsp_specs | 0 | ||||
-rw-r--r-- | bsps/powerpc/virtex5/start/bspstart.c | 4 | ||||
-rw-r--r-- | bsps/powerpc/virtex5/start/dummy_console.c | 2 | ||||
-rw-r--r-- | bsps/powerpc/virtex5/start/linkcmds | 2 | ||||
-rw-r--r-- | bsps/powerpc/virtex5/start/mmu.c | 3 |
9 files changed, 73 insertions, 56 deletions
diff --git a/bsps/powerpc/virtex5/headers.am b/bsps/powerpc/virtex5/headers.am deleted file mode 100644 index 4a5dff7ff9..0000000000 --- a/bsps/powerpc/virtex5/headers.am +++ /dev/null @@ -1,11 +0,0 @@ -## This file was generated by "./boostrap -H". - -include_HEADERS = -include_HEADERS += ../../../../../../bsps/powerpc/virtex5/include/bsp.h -include_HEADERS += include/bspopts.h -include_HEADERS += ../../../../../../bsps/powerpc/virtex5/include/tm27.h - -include_bspdir = $(includedir)/bsp -include_bsp_HEADERS = -include_bsp_HEADERS += ../../../../../../bsps/powerpc/virtex5/include/bsp/irq.h -include_bsp_HEADERS += ../../../../../../bsps/powerpc/virtex5/include/bsp/mmu.h diff --git a/bsps/powerpc/virtex5/include/bsp.h b/bsps/powerpc/virtex5/include/bsp.h index 97a3da9bd7..00be499e9c 100644 --- a/bsps/powerpc/virtex5/include/bsp.h +++ b/bsps/powerpc/virtex5/include/bsp.h @@ -12,7 +12,7 @@ * Author: Thomas Doerfler <td@imd.m.isar.de> * IMD Ingenieurbuero fuer Microcomputertechnik * - * COPYRIGHT (c) 1998 by IMD + * Copyright (c) 1998 IMD Ingenieurbuero fuer Microcomputertechnik * * Changes from IMD are covered by the original distributions terms. * This file has been derived from the papyrus BSP. diff --git a/bsps/powerpc/virtex5/include/bsp/irq.h b/bsps/powerpc/virtex5/include/bsp/irq.h index a61a434236..b15bf883fe 100644 --- a/bsps/powerpc/virtex5/include/bsp/irq.h +++ b/bsps/powerpc/virtex5/include/bsp/irq.h @@ -1,21 +1,36 @@ -/*===============================================================*\ -| Project: RTEMS virtex BSP | -+-----------------------------------------------------------------+ -| Copyright (c) 2007 | -| Embedded Brains GmbH | -| Obere Lagerstr. 30 | -| D-82178 Puchheim | -| Germany | -| rtems@embedded-brains.de | -+-----------------------------------------------------------------+ -| 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. | -| | -+-----------------------------------------------------------------+ -| this file declares constants of the interrupt controller | -\*===============================================================*/ +/* SPDX-License-Identifier: BSD-2-Clause */ + +/* + * RTEMS virtex BSP + * + * This file declares constants of the interrupt controller. + */ + +/* + * Copyright (c) 2007 embedded brains GmbH & Co. KG + * + * 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 VIRTEX5_IRQ_IRQ_H #define VIRTEX5_IRQ_IRQ_H diff --git a/bsps/powerpc/virtex5/irq/irq_init.c b/bsps/powerpc/virtex5/irq/irq_init.c index 1fea9214aa..ec0a2ad5f9 100644 --- a/bsps/powerpc/virtex5/irq/irq_init.c +++ b/bsps/powerpc/virtex5/irq/irq_init.c @@ -1,24 +1,36 @@ -/*===============================================================*\ -| Project: RTEMS virtex BSP | -+-----------------------------------------------------------------+ -| Partially based on the code references which are named below. | -| Adaptions, modifications, enhancements and any recent parts of | -| the code are: | -| Copyright (c) 2007 | -| Embedded Brains GmbH | -| Obere Lagerstr. 30 | -| D-82178 Puchheim | -| Germany | -| rtems@embedded-brains.de | -+-----------------------------------------------------------------+ -| 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. | -| | -+-----------------------------------------------------------------+ -| this file contains the irq controller handler | -\*===============================================================*/ +/* SPDX-License-Identifier: BSD-2-Clause */ + +/* + * RTEMS virtex BSP + * + * This file contains the irq controller handler. + */ + +/* + * Copyright (c) 2007 embedded brains GmbH & Co. KG + * + * 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. + */ + #include <libcpu/spr.h> #include <bsp/irq.h> #include <bsp.h> diff --git a/bsps/powerpc/virtex5/start/bsp_specs b/bsps/powerpc/virtex5/start/bsp_specs deleted file mode 100644 index e69de29bb2..0000000000 --- a/bsps/powerpc/virtex5/start/bsp_specs +++ /dev/null diff --git a/bsps/powerpc/virtex5/start/bspstart.c b/bsps/powerpc/virtex5/start/bspstart.c index c2783f6225..13711c5701 100644 --- a/bsps/powerpc/virtex5/start/bspstart.c +++ b/bsps/powerpc/virtex5/start/bspstart.c @@ -10,7 +10,7 @@ * Author: Thomas Doerfler <td@imd.m.isar.de> * IMD Ingenieurbuero fuer Microcomputertechnik * - * COPYRIGHT (c) 1998 by IMD + * Copyright (c) 1998 IMD Ingenieurbuero fuer Microcomputertechnik * * Changes from IMD are covered by the original distributions terms. * This file has been derived from the papyrus BSP: @@ -34,7 +34,7 @@ * with linker command file by * Thomas Doerfler <td@imd.m.isar.de> * for these modifications: - * COPYRIGHT (c) 1997 by IMD, Puchheim, Germany. + * Copyright (c) 1997 IMD Ingenieurbuero fuer Microcomputertechnik * * To anyone who acknowledges that this file is provided "AS IS" * without any express or implied warranty: diff --git a/bsps/powerpc/virtex5/start/dummy_console.c b/bsps/powerpc/virtex5/start/dummy_console.c index 2cdab33c8c..7480402cde 100644 --- a/bsps/powerpc/virtex5/start/dummy_console.c +++ b/bsps/powerpc/virtex5/start/dummy_console.c @@ -28,7 +28,7 @@ static rtems_termios_callbacks gMemCallbacks = { 0, /* SetAttr */ 0, /* stopRemoteTx */ 0, /* startRemoteTx */ - 0 /* outputUsesInterrupts */ + TERMIOS_POLLED /* outputUsesInterrupts */ }; rtems_device_driver console_initialize(rtems_device_major_number major, diff --git a/bsps/powerpc/virtex5/start/linkcmds b/bsps/powerpc/virtex5/start/linkcmds index ca81d57fde..15af537066 100644 --- a/bsps/powerpc/virtex5/start/linkcmds +++ b/bsps/powerpc/virtex5/start/linkcmds @@ -253,7 +253,7 @@ SECTIONS PROVIDE(__bsp_ram_start = .); .noinit (NOLOAD) : { - *(.noinit*) + *(SORT_BY_NAME (SORT_BY_ALIGNMENT (.noinit*))) } >RAM .rtemsstack (NOLOAD) : { diff --git a/bsps/powerpc/virtex5/start/mmu.c b/bsps/powerpc/virtex5/start/mmu.c index 874c57ee6f..e9bbd77264 100644 --- a/bsps/powerpc/virtex5/start/mmu.c +++ b/bsps/powerpc/virtex5/start/mmu.c @@ -66,6 +66,7 @@ #include <rtems.h> #include <rtems/bspIo.h> #include <rtems/powerpc/powerpc.h> +#include <rtems/score/sysstate.h> #include <inttypes.h> #include <stdio.h> @@ -92,7 +93,7 @@ myprintf(FILE *f, char *fmt, ...) va_list ap; va_start(ap, fmt); - if (!f || !_impure_ptr->__sdidinit) { + if (!f || !_System_state_Is_up(_System_state_Get())) { /* Might be called at an early stage when stdio is not yet initialized. */ vprintk(fmt,ap); } else { |