diff options
Diffstat (limited to 'bsps/powerpc/virtex')
| -rw-r--r-- | bsps/powerpc/virtex/console/consolelite.c | 8 | ||||
| -rw-r--r-- | bsps/powerpc/virtex/headers.am | 13 | ||||
| -rw-r--r-- | bsps/powerpc/virtex/include/bsp.h | 2 | ||||
| -rw-r--r-- | bsps/powerpc/virtex/include/bsp/irq.h | 51 | ||||
| -rw-r--r-- | bsps/powerpc/virtex/irq/irq_init.c | 44 | ||||
| -rw-r--r-- | bsps/powerpc/virtex/start/bsp_specs | 0 | ||||
| -rw-r--r-- | bsps/powerpc/virtex/start/bspstart.c | 12 | ||||
| -rw-r--r-- | bsps/powerpc/virtex/start/linkcmds.in | 35 | ||||
| -rw-r--r-- | bsps/powerpc/virtex/start/start.S | 31 |
9 files changed, 84 insertions, 112 deletions
diff --git a/bsps/powerpc/virtex/console/consolelite.c b/bsps/powerpc/virtex/console/consolelite.c index 4d0b2db17f..9a2595a535 100644 --- a/bsps/powerpc/virtex/console/consolelite.c +++ b/bsps/powerpc/virtex/console/consolelite.c @@ -57,28 +57,28 @@ -RTEMS_INLINE_ROUTINE uint32_t xlite_uart_control(uint32_t base) +static inline uint32_t xlite_uart_control(uint32_t base) { uint32_t c = *((volatile uint32_t*)(base+CTRL_REG)); return c; } -RTEMS_INLINE_ROUTINE uint32_t xlite_uart_status(uint32_t base) +static inline uint32_t xlite_uart_status(uint32_t base) { uint32_t c = *((volatile uint32_t*)(base+STAT_REG)); return c; } -RTEMS_INLINE_ROUTINE uint32_t xlite_uart_read(uint32_t base) +static inline uint32_t xlite_uart_read(uint32_t base) { uint32_t c = *((volatile uint32_t*)(base+RECV_REG)); return c; } -RTEMS_INLINE_ROUTINE void xlite_uart_write(uint32_t base, char ch) +static inline void xlite_uart_write(uint32_t base, char ch) { *(volatile uint32_t*)(base+TRAN_REG) = (uint32_t)ch; return; diff --git a/bsps/powerpc/virtex/headers.am b/bsps/powerpc/virtex/headers.am deleted file mode 100644 index 9feceaf16d..0000000000 --- a/bsps/powerpc/virtex/headers.am +++ /dev/null @@ -1,13 +0,0 @@ -## This file was generated by "./boostrap -H". - -include_HEADERS = -include_HEADERS += ../../../../../../bsps/powerpc/virtex/include/bsp.h -include_HEADERS += include/bspopts.h -include_HEADERS += ../../../../../../bsps/powerpc/virtex/include/tm27.h -include_HEADERS += ../../../../../../bsps/powerpc/virtex/include/xiltemac.h -include_HEADERS += ../../../../../../bsps/powerpc/virtex/include/xparameters_dflt.h - -include_bspdir = $(includedir)/bsp -include_bsp_HEADERS = -include_bsp_HEADERS += ../../../../../../bsps/powerpc/virtex/include/bsp/irq.h -include_bsp_HEADERS += ../../../../../../bsps/powerpc/virtex/include/bsp/opbintctrl.h diff --git a/bsps/powerpc/virtex/include/bsp.h b/bsps/powerpc/virtex/include/bsp.h index b55e1a61f3..69f98f4b76 100644 --- a/bsps/powerpc/virtex/include/bsp.h +++ b/bsps/powerpc/virtex/include/bsp.h @@ -15,7 +15,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/virtex/include/bsp/irq.h b/bsps/powerpc/virtex/include/bsp/irq.h index 892f18be5e..17af22614d 100644 --- a/bsps/powerpc/virtex/include/bsp/irq.h +++ b/bsps/powerpc/virtex/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 VIRTEX_IRQ_IRQ_H #define VIRTEX_IRQ_IRQ_H diff --git a/bsps/powerpc/virtex/irq/irq_init.c b/bsps/powerpc/virtex/irq/irq_init.c index e18df51594..320053e3a2 100644 --- a/bsps/powerpc/virtex/irq/irq_init.c +++ b/bsps/powerpc/virtex/irq/irq_init.c @@ -1,36 +1,22 @@ -/*===============================================================*\ -| 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 | -\*===============================================================*/ - -/* Content moved from opbintctrl.c: +/* + * RTEMS virtex BSP + * + * This file contains the irq controller handler. + * + * Content moved from opbintctrl.c: * * This file contains definitions and declarations for the * Xilinx Off Processor Bus (OPB) Interrupt Controller + */ + +/* + * Author: Keith Robertson <kjrobert@alumni.uwaterloo.ca> + * COPYRIGHT (c) 2005 Linn Products Ltd, Scotland. + * Copyright (c) 2007 embedded brains GmbH & Co. KG * - * Author: Keith Robertson <kjrobert@alumni.uwaterloo.ca> - * COPYRIGHT (c) 2005 Linn Products Ltd, Scotland. - * - * 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. + * 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. */ #include <bsp.h> diff --git a/bsps/powerpc/virtex/start/bsp_specs b/bsps/powerpc/virtex/start/bsp_specs deleted file mode 100644 index e69de29bb2..0000000000 --- a/bsps/powerpc/virtex/start/bsp_specs +++ /dev/null diff --git a/bsps/powerpc/virtex/start/bspstart.c b/bsps/powerpc/virtex/start/bspstart.c index a4054f1b36..641eff9071 100644 --- a/bsps/powerpc/virtex/start/bspstart.c +++ b/bsps/powerpc/virtex/start/bspstart.c @@ -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: @@ -36,7 +36,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: @@ -98,7 +98,13 @@ void bsp_start( void ) (uintptr_t) _ISR_Stack_area_begin, virtex_exc_vector_base ); - __asm__ volatile ("mtevpr %0" : : "r" (virtex_exc_vector_base)); + __asm__ volatile ( + ".machine \"push\"\n" + ".machine \"any\"\n" + "mtevpr %0\n" + ".machine \"pop\"" : : + "r" (virtex_exc_vector_base) + ); bsp_interrupt_initialize(); } diff --git a/bsps/powerpc/virtex/start/linkcmds.in b/bsps/powerpc/virtex/start/linkcmds.in deleted file mode 100644 index 41fac076d7..0000000000 --- a/bsps/powerpc/virtex/start/linkcmds.in +++ /dev/null @@ -1,35 +0,0 @@ -EXTERN (__vectors) - -MEMORY { - RAM : ORIGIN = @VIRTEX_RAM_ORIGIN@, LENGTH = @VIRTEX_RAM_LENGTH@ - FAST_RAM : ORIGIN = @VIRTEX_FAST_RAM_ORIGIN@, LENGTH = @VIRTEX_FAST_RAM_LENGTH@ - RESET : ORIGIN = @VIRTEX_RESET_ORIGIN@, LENGTH = @VIRTEX_RESET_LENGTH@ - EMPTY : ORIGIN = 0x0, LENGTH = 0x0 -} - -REGION_ALIAS ("REGION_START", RAM); -REGION_ALIAS ("REGION_FAST_TEXT", FAST_RAM); -REGION_ALIAS ("REGION_FAST_TEXT_LOAD", RAM); -REGION_ALIAS ("REGION_TEXT", RAM); -REGION_ALIAS ("REGION_TEXT_LOAD", RAM); -REGION_ALIAS ("REGION_RODATA", RAM); -REGION_ALIAS ("REGION_RODATA_LOAD", RAM); -REGION_ALIAS ("REGION_FAST_DATA", FAST_RAM); -REGION_ALIAS ("REGION_FAST_DATA_LOAD", RAM); -REGION_ALIAS ("REGION_DATA", RAM); -REGION_ALIAS ("REGION_DATA_LOAD", RAM); -REGION_ALIAS ("REGION_BSS", RAM); -REGION_ALIAS ("REGION_RTEMSSTACK", RAM); -REGION_ALIAS ("REGION_WORK", RAM); -REGION_ALIAS ("REGION_STACK", RAM); -REGION_ALIAS ("REGION_NOCACHE", EMPTY); -REGION_ALIAS ("REGION_NOCACHE_LOAD", EMPTY); -REGION_ALIAS ("REGION_NVRAM", EMPTY); - -SECTIONS { - .virtex_reset : { - KEEP (*(.virtex_reset)) - } > RESET AT > RESET -} - -INCLUDE linkcmds.base diff --git a/bsps/powerpc/virtex/start/start.S b/bsps/powerpc/virtex/start/start.S index 3c9cd229d3..466c5a9aa8 100644 --- a/bsps/powerpc/virtex/start/start.S +++ b/bsps/powerpc/virtex/start/start.S @@ -1,15 +1,28 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ + /* - * Copyright (c) 2010-2013 embedded brains GmbH. All rights reserved. + * Copyright (C) 2010, 2013 embedded brains GmbH & Co. KG * - * embedded brains GmbH - * Dornierstr. 4 - * 82178 Puchheim - * Germany - * <rtems@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. * - * 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 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 <rtems/asm.h> |