I have no idea what the correct answer is but is this the time to make all the references to Gaisler the same? You guys have been bought a few times with names changes :)
Other than that, these all look good to me. --joel On Mon, Nov 14, 2022, 4:03 AM Daniel Cederman <ceder...@gaisler.com> wrote: > This patch changes the license to BSD-2 for all source files where the > copyright is held by Aeroflex Gaisler, Cobham Gaisler, or Gaisler Research. > Some files also includes copyright right statements from OAR and/or > embedded Brains in addition to Gaisler. > > Updates #3053. > --- > bsps/riscv/griscv/clock/clockdrv.c | 25 +++++++++++++++++++--- > bsps/riscv/griscv/console/console.c | 25 +++++++++++++++++++--- > bsps/riscv/griscv/console/printk_support.c | 25 +++++++++++++++++++--- > bsps/riscv/griscv/include/amba.h | 25 +++++++++++++++++++--- > bsps/riscv/noel/include/bsp.h | 2 ++ > 5 files changed, 90 insertions(+), 12 deletions(-) > > diff --git a/bsps/riscv/griscv/clock/clockdrv.c > b/bsps/riscv/griscv/clock/clockdrv.c > index a5b7b15760..a8e157c71c 100644 > --- a/bsps/riscv/griscv/clock/clockdrv.c > +++ b/bsps/riscv/griscv/clock/clockdrv.c > @@ -1,3 +1,5 @@ > +/* SPDX-License-Identifier: BSD-2-Clause */ > + > /* > * Clock Tick Device Driver > * > @@ -15,9 +17,26 @@ > * > * Copyright (c) 2014, 2018 embedded brains GmbH > * > - * 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. > */ > > #include <bsp.h> > diff --git a/bsps/riscv/griscv/console/console.c > b/bsps/riscv/griscv/console/console.c > index c0e19cddfe..af4c19d4cb 100644 > --- a/bsps/riscv/griscv/console/console.c > +++ b/bsps/riscv/griscv/console/console.c > @@ -1,3 +1,5 @@ > +/* SPDX-License-Identifier: BSD-2-Clause */ > + > /* > * This file contains the TTY driver for the GRLIB APBUART > * > @@ -10,9 +12,26 @@ > * COPYRIGHT (c) 2004. > * Gaisler Research. > * > - * 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. > */ > > /* Define CONSOLE_USE_INTERRUPTS to enable APBUART interrupt handling > instead > diff --git a/bsps/riscv/griscv/console/printk_support.c > b/bsps/riscv/griscv/console/printk_support.c > index f232203520..3a3450551f 100644 > --- a/bsps/riscv/griscv/console/printk_support.c > +++ b/bsps/riscv/griscv/console/printk_support.c > @@ -1,3 +1,5 @@ > +/* SPDX-License-Identifier: BSD-2-Clause */ > + > /* > * This file contains the TTY driver for the GRLIb APBUART > * > @@ -10,9 +12,26 @@ > * COPYRIGHT (c) 2011. > * Aeroflex Gaisler. > * > - * 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. > */ > > #include <bsp.h> > diff --git a/bsps/riscv/griscv/include/amba.h > b/bsps/riscv/griscv/include/amba.h > index 292660d5c1..cff3a53d9e 100644 > --- a/bsps/riscv/griscv/include/amba.h > +++ b/bsps/riscv/griscv/include/amba.h > @@ -1,3 +1,5 @@ > +/* SPDX-License-Identifier: BSD-2-Clause */ > + > /** > * @file > * > @@ -12,9 +14,26 @@ > * COPYRIGHT (c) 2004. > * Gaisler Research > * > - * 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 __AMBA_H__ > diff --git a/bsps/riscv/noel/include/bsp.h b/bsps/riscv/noel/include/bsp.h > index 1b6686a01a..8cad281b6a 100644 > --- a/bsps/riscv/noel/include/bsp.h > +++ b/bsps/riscv/noel/include/bsp.h > @@ -1,3 +1,5 @@ > +/* SPDX-License-Identifier: BSD-2-Clause */ > + > /** > * @file > * > -- > 2.37.2 > > _______________________________________________ > devel mailing list > devel@rtems.org > http://lists.rtems.org/mailman/listinfo/devel >
_______________________________________________ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel
